[PC-BSD Commits] r590 - pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts

[svn at pcbsd.org]

Author: kris
Date: 2007-08-10 18:05:41 -0700 (Fri, 10 Aug 2007)
New Revision: 590

Modified:
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.MountUpgrade.sh
Log:

Fixed bug preserving the applnk folder on upgrade



Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.MountUpgrade.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.MountUpgrade.sh	2007-08-11 00:35:21 UTC (rev 589)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.MountUpgrade.sh	2007-08-11 01:05:41 UTC (rev 590)
@@ -64,8 +64,14 @@
 mv /mnt/etc/X11/xorg.conf /mnt/etc/X11/xorg.conf.preUpgrade 2>/dev/null
 rm /mnt/var/run/denyhosts.pid
 
+# Move back the applnk directory
+mkdir -p /mnt/usr/local/share
+chmod 755 /mnt/usr
+chmod 755 /mnt/usr/local
+chmod 755 /mnt/usr/local/share
+mv -f /mnt/tmp/upgradebackup/applnk /mnt/usr/local/share/applnk
+
 # Start the Tar Extraction now
-echo "........."
 
 # Unset LANG variable
 LANGOLD="$LANG"
@@ -76,7 +82,7 @@
 #Reset LANG
 LANG="$LANGOLD"
 
-cp f /usr/local/pcbsd/LANGS/* /mnt/PCBSD/LANGS/ >/dev/null
+cp -f /usr/local/pcbsd/LANGS/* /mnt/PCBSD/LANGS/ >/dev/null
 
 # Restore old data
 echo "Restoring saved data..."
@@ -86,7 +92,6 @@
 rm -rf /mnt/usr/home
 rm -rf /mnt/root
 
-mv -f /mnt/tmp/upgradebackup/applnk /mnt/usr/local/share/applnk
 mv -f /mnt/tmp/upgradebackup/kdmrc /mnt/usr/local/share/config/kdm/kdmrc
 mv -f /mnt/tmp/upgradebackup/MyPrograms /mnt/usr/local/MyPrograms
 mv -f /mnt/tmp/upgradebackup/Programs /mnt/Programs