[PC-BSD Commits] r3328 - pbibuild/modules/lincity-ng/overlay-dir

[svn at pcbsd.org]

Author: kris
Date: 2009-01-26 11:11:28 -0800 (Mon, 26 Jan 2009)
New Revision: 3328

Modified:
   pbibuild/modules/lincity-ng/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/lincity-ng/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/lincity-ng/overlay-dir/PBI.SetupScript.sh
Log:

Updated lincity-ng, now 100% self-contained



Modified: pbibuild/modules/lincity-ng/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/lincity-ng/overlay-dir/PBI.FirstRun.sh	2009-01-26 16:43:11 UTC (rev 3327)
+++ pbibuild/modules/lincity-ng/overlay-dir/PBI.FirstRun.sh	2009-01-26 19:11:28 UTC (rev 3328)
@@ -15,34 +15,3 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-
-
-if [ -e "/usr/local/bin/lincity-ng" ]
-then
-    # Looks like FF is installed, ask if they want to remove the old one
-    ls -al /usr/local/bin/lincity-ng | grep Programs 2>/dev/null
-    if [ "$?" = "0" ]
-    then
-      kdialog --yesno "LinCity-NG is already installed, do you wish to uninstall it?" 
-      if [ "$?" = "0" ]
-      then
-        FF="`ls -al /usr/local/bin/lincity-ng | cut -d '>' -f 2 | cut -d "/" -f 3`"
-        echo $FF | grep LinCity-NG 2>/dev/null
-        if [ "$?" = "0" ]
-        then
-          PBIdelete -remove ${FF}
-        else
-          kdialog --sorry "LinCity-NG could not be automatically removed... Please remove it in Add / Remove Programs and try again."
-          return 2
-        fi
-      else
-        kdialog --sorry "LinCity-NG is already installed, it must be uninstalled before loading this PBI"
-        return 2
-      fi
-      
-    else
-      # Could not find a link to PBI folder
-      kdialog --sorry "LinCity-NG is already installed, it must be uninstalled before loading this PBI"
-      return 2
-    fi
-fi 

Modified: pbibuild/modules/lincity-ng/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/lincity-ng/overlay-dir/PBI.RemoveScript.sh	2009-01-26 16:43:11 UTC (rev 3327)
+++ pbibuild/modules/lincity-ng/overlay-dir/PBI.RemoveScript.sh	2009-01-26 19:11:28 UTC (rev 3328)
@@ -6,11 +6,6 @@
 # ${2} is the username of person performing the deletion.
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
-rm -fR /usr/local/bin/lincity-ng
-rm -fR /usr/local/share/lincity-ng
-rm -fR /usr/local/share/pixmaps/lincity-ng.png
-rm -fR /usr/local/share/doc/lincity-ng
-#rm -fR /usr/local/share/applications/lincity-ng.desktop
 
 if [ ! -z "$DISPLAY" ]
 then

Modified: pbibuild/modules/lincity-ng/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/lincity-ng/overlay-dir/PBI.SetupScript.sh	2009-01-26 16:43:11 UTC (rev 3327)
+++ pbibuild/modules/lincity-ng/overlay-dir/PBI.SetupScript.sh	2009-01-26 19:11:28 UTC (rev 3328)
@@ -14,10 +14,14 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-ln -s /Programs/${PROGDIR}/.sbin/lincity-ng /usr/local/bin/lincity-ng
-ln -s /Programs/${PROGDIR}/share/lincity-ng /usr/local/share/lincity-ng
-ln -s /Programs/${PROGDIR}/share/pixmaps/lincity-ng.png /usr/local/share/pixmaps/lincity-ng.png
-ln -s /Programs/${PROGDIR}/share/doc/lincity-ng /usr/local/share/doc/lincity-ng
-#ln -s /Programs/${PROGDIR}/share/applications/lincity-ng.desktop /usr/local/share/applications/lincity-ng.desktop
 
-echo "LAUNCHCLOSE: /usr/local/bin/lincity-ng"
+# Check which font config we want to link to
+if [ -d "/PCBSD/local/etc/fonts" ]
+then
+  ln -s /PCBSD/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+else
+  ln -s /usr/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+fi
+
+
+echo "LAUNCHCLOSE: /Programs/bin/lincity-ng"