Final patch for autoup.sh v0.22

[miquels@cistron.nl (Miquel van Smoorenburg)]

This patch fixes the following things:

1. libgdbm1g is in base/, not in devel/
2. __EOF__ needs to be at the start of the line
3. `tempfile' is not present on a bo system ..
4. libc5@libc6 is not a valid password for anonymous on most systems
5. Install latest libg++27 otherwise libc5-dev cannot be removed
6. Don't debug, really install
7. Actually remove -dev packages

This should fix most if not all of the problems I encountered,
however I'm almost out of standard "bo" systems to test this on :)

--- autoup.sh.orig	Thu Mar 26 12:03:57 1998
+++ autoup.sh	Thu Mar 26 13:18:12 1998
@@ -28,13 +28,13 @@
 
 # misc tweakable variables
 
-#DPKG="$(which dpkg)"
-#LDCONFIG=$(which ldconfig)
+DPKG="$(which dpkg)"
+LDCONFIG=$(which ldconfig)
 
 # uncomment for debugging
 #set -x
-DPKG="echo dpkg"
-LDCONFIG="echo ldconfig"
+#DPKG="echo dpkg"
+#LDCONFIG="echo ldconfig"
 
 DPKG_ARGS="-iBE  --force-overwrite"
 DATE=$(date +%m%d-%T)
@@ -56,9 +56,9 @@
 PKGS_LIBRL="oldlibs/libreadline2_*.deb"
 PKGS_LIBRLG="base/libreadlineg2_*.deb"
 PKGS_BASH="base/bash_*.deb"
-PKGS_LIBGPP="libs/libg++272_*.deb"
+PKGS_LIBGPP="oldlibs/libg++27_*.deb libs/libg++272_*.deb"
 PKGS_DPKG="base/dpkg_*.deb utils/dpkg-dev_*.deb"
-PKGS_LIBGDBM="oldlibs/libgdbm1_*.deb devel/libgdbmg1_*.deb"
+PKGS_LIBGDBM="oldlibs/libgdbm1_*.deb base/libgdbmg1_*.deb"
 PKGS_PERLBASE="base/perl-base_*.deb"
 PKGS_PERL="interpreters/perl_*.deb"
 PKGS_MOREDPKG="interpreters/data-dumper_*.deb interpreters/libnet-perl_*.deb \
@@ -134,9 +134,11 @@
                   FTP_SITE=$FTP_SITE_2 
                   FTP_DIR=$FTP_DIR_2 ;;
              3)
-                  echo "Enter the address of your mirror site:"
+                  echo "Enter the hostname of your mirror site:"
+		  echo -n "> "
                   read FTP_SITE
-                  echo "Enter the ftp path:"
+                  echo "Enter the ftp path (like debian/hamm/hamm/$ARCH):"
+		  echo -n "> "
                   read FTP_DIR ;;
         esac
 
@@ -154,6 +156,7 @@
 
         [ -n "$DEFAULT" ] && echo or just hit enter to use "$DEFAULT".
 
+	echo -n "> "
         read DM
 
         [ -z "$DM" ] && DM=$DEFAULT
@@ -172,24 +175,24 @@
 
         echo "Fetching packages from: $FTP_SITE"
 
-        ftpscript=$(tempfile)
+        ftpscript="$DM.$$.scr"
 
         cat <<__EOF__ >$ftpscript
             verbose
             open $FTP_SITE
-            user anonymous libc5@libc6
+            user anonymous libc6-upgrade@autoup.sh.debian.org
             hash
             binary
             cd $FTP_DIR
             pwd
-        __EOF__
+__EOF__
 
         for file in $ALLPKGS; do
             cat <<__EOF__ >>$ftpscript
                 cd $FTP_DIR/$(dirname $file)
                 lcd $FTP_DEST/$(dirname $file)
                 mget $(basename $file)
-        __EOF__
+__EOF__
         done
 
         ftp -n -i <$ftpscript
@@ -321,7 +324,7 @@
     grep -- "-dev$\|-pic$\|-dbg$" )
 
 # don't bother running 'dpkg -r' if there's nothing to remove.
-RM_LIST="$DEV_PACKAGES $PKGS_RM"
+RM_LIST="$DEVPACKAGES $PKGS_RM"
 
 if [ ! "$RM_LIST" = " " ] ; then
     # log what gets removed.


Mike.
-- 
 Miquel van Smoorenburg | Our vision is to speed up time,
    miquels@cistron.nl  |   eventually eliminating it.


--
To UNSUBSCRIBE, email to debian-devel-request@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org