[PC-BSD Commits] r3671 - pbibuild/modules/bacula-bat/overlay-dir

svn at pcbsd.org svn at pcbsd.org
Thu Mar 26 23:39:39 PST 2009


Author: silvers
Date: 2009-03-27 00:39:36 -0700 (Fri, 27 Mar 2009)
New Revision: 3671

Modified:
   pbibuild/modules/bacula-bat/overlay-dir/PBI.FirstRun.sh
Log:
remove old versions of PBI with PBI.RemoveScript.sh

Modified: pbibuild/modules/bacula-bat/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/bacula-bat/overlay-dir/PBI.FirstRun.sh	2009-03-27 07:22:01 UTC (rev 3670)
+++ pbibuild/modules/bacula-bat/overlay-dir/PBI.FirstRun.sh	2009-03-27 07:39:36 UTC (rev 3671)
@@ -23,19 +23,6 @@
 fi
 
 if ( kdialog --warningcontinuecancel "Previous installations of Bat will be deleted!" ); then
-	man=${BASE}/man/man1/bat.1.gz
-	bin=${BASE}/sbin/bat
-	conf=${BASE}/etc/bat.conf.sample
-	icon1=${BASE}/share/pixmaps/bat.png
-	icon2=${BASE}/share/pixmaps/bat-sh.png
-	icon3=${BASE}/share/pixmaps/bat-kommander.png
-	for l in $man $bin $conf $icon1 $icon2 $icon3; do
-		# if it is linked, it was probably created by PBI
-		if [ -h "$l" ]; then
-			rm "$l"
-		fi
-	done
-
 	for bat in `ls -1 $Programs/ | grep "^BaculaBat\([0-9]\.\|\>\)"`; do
 		version="`echo $bat | sed "s/^BaculaBat//"`"
 		if [ "$version" != "" ]; then
@@ -43,7 +30,13 @@
 		else
 			versions="$versions $bat"
 		fi
-		rm -rf "$Programs/$bat"
+		
+		# let's try to remove the previous installation the correct way
+		if [ -f "$Programs/$bat/PBI.RemoveScript.sh" ]; then
+			"$Programs/$bat/PBI.RemoveScript.sh"
+		else
+			rm -rf "$Programs/$bat"
+		fi
 	done
 
 	if [ "$versions" ]; then



More information about the Commits mailing list