One generate apt-ftparchive config; refactor, simplify

[git-tools-moved-to-github.git] / update-archive / update-archive.sh

diff --git a/update-archive/update-archive.sh b/update-archive/update-archive.sh
index 740fefb..c99571a 100755 (executable)
--- a/update-archive/update-archive.sh
+++ b/update-archive/update-archive.sh
@@ -56,18 +56,13 @@ if test ! -f ${confdir}/apt-ftparchive.conf.in; then
        echo "$0: ${condir}/apt-ftparchive.conf.in not found"
        exit 1
 fi
-if test ! -f ${confdir}/apt-release.conf.in; then
-       echo "$0: ${condir}/apt-release.conf.in not found"
-       exit 1
-fi
-
 if test ! -x /usr/bin/apt-ftparchive; then
        echo "$0: /usr/bin/apt-ftparchive missing. Install apt-utils"
        exit 1
 fi
 
 # gpg -a -d -o Release.gpg Release
-       
+
 architectures="i386 amd64"
 
 if test "$DEBIAN_DIST"; then
@@ -115,7 +110,7 @@ for vdist in $DISTRIBUTIONS ; do
                exit 1
        fi
        cd $ftpdir
-       test -d tmp || mkdir tmp
+       mkdir -p tmp
        # Uncomment to clean the .db (cache)
        if $clear; then
                rm tmp/*
@@ -125,7 +120,7 @@ for vdist in $DISTRIBUTIONS ; do
        for section in main restricted; do
                # Prepare pool
                d=pool/dists/$fdist/$section
-               if test ! -d $d; then mkdir -p $d; fi
+               mkdir -p $d
                mkdir -p $d/source
                # Remove invalid symlinks (source, i386, amd64,..)
                for l in $d/*/*; do
@@ -175,55 +170,41 @@ for vdist in $DISTRIBUTIONS ; do
                        fi
                        for arch in $architectures; do
                                d=dists/$fdist/$section/binary-$arch
-                               if test ! -d $d; then mkdir -p $d; fi
+                               mkdir -p $d
                                echo "Archive: $fdist" >$d/Release
                                echo "Component: $section" >>$d/Release
-                               echo 'Origin: Indexdata' >>$d/Release
+                               echo 'Origin: Index Data' >>$d/Release
                                echo "Architecture: $arch" >>$d/Release
                        done
                        d=dists/$fdist/$section/source
-                       if test ! -d $d; then mkdir -p $d; fi
+                       mkdir -p $d
                        echo "Archive: $fdist" >$d/Release
                        echo "Component: $section" >>$d/Release
-                       echo 'Origin: Indexdata' >>$d/Release
+                       echo 'Origin: Index Data' >>$d/Release
                        echo 'Architecture: source' >>$d/Release
                fi
        done
-       # generate
-       echo "Begin Generate $fdist: $sections"
-       F=apt-ftparchive.conf
-       sed "s/@dist@/$fdist/g" <${confdir}/${F}.in | \
-               sed "s/@architectures@/${architectures}/g" | \
-               sed "s/@sections@/${sections}/g" > $F
-       # Don't know if clean is needed!
-       # apt-ftparchive clean apt-ftparchive.conf
-       apt-ftparchive generate apt-ftparchive.conf 2>&1
-       echo "Done generate $fdist: $sections"
-
-       # release
-       r=dists/$fdist/Release
-       F=apt-release.conf
-       sed "s/@dist@/$fdist/g" <${confdir}/${F}.in | \
-               sed "s/@architectures@/${architectures}/g" | \
-               sed "s/@sections@/${sections}/g" > $F
-       # Move Release file away while calling using release 
-       rm -f $r
-       apt-ftparchive -c $F release dists/$fdist >tmp_Release
-       if $noauto; then
-               sed -e 's/^Suite:/NotAutomatic: yes\nButAutomaticUpgrades: yes\nSuite:/g' <tmp_Release >$r
-       else
-               mv tmp_Release $r
-       fi
-
-       # sign
-       if true; then
+       if test -n "$sections"; then
+               F=apt-ftparchive.conf
+               sed "s/@dist@/$fdist/g" <${confdir}/${F}.in | \
+                       sed "s/@architectures@/${architectures}/g" | \
+                       sed "s/@sections@/${sections}/g" > $F
+               apt-ftparchive generate apt-ftparchive.conf 2>&1
+               r=dists/$fdist/Release
+               rm -f $r # Move Release file away while calling using release
+               apt-ftparchive -c $F release dists/$fdist >tmp_Release
+               if $noauto; then
+                       sed -e 's/^Suite:/NotAutomatic: yes\nButAutomaticUpgrades: yes\nSuite:/g' <tmp_Release >$r
+               else
+                       mv tmp_Release $r
+               fi
                rm -f ${r}.gpg
                gpg --sign -u "Index Data" -ba -o ${r}.gpg $r
        fi
 done
 # Local Variables:
 # mode:shell-script
-# sh-indentation: 2
+# sh-indentation: 8
 # sh-basic-offset: 8
 # End: