[PC-BSD Commits] r3317 - in pbibuild/modules/iourbanterror: . kmenu-dir overlay-dir overlay-dir/scripts

svn at pcbsd.org svn at pcbsd.org
Thu Jan 22 12:31:23 PST 2009


Author: kris
Date: 2009-01-22 12:31:22 -0800 (Thu, 22 Jan 2009)
New Revision: 3317

Removed:
   pbibuild/modules/iourbanterror/kmenu-dir/uninstall
   pbibuild/modules/iourbanterror/overlay-dir/scripts/removepbi.sh
Modified:
   pbibuild/modules/iourbanterror/build.sh
   pbibuild/modules/iourbanterror/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/iourbanterror/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/iourbanterror/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/iourbanterror/pbi.conf
Log:

Updated iourbanterror to be 100% self-contained



Modified: pbibuild/modules/iourbanterror/build.sh
===================================================================
--- pbibuild/modules/iourbanterror/build.sh	2009-01-22 20:08:59 UTC (rev 3316)
+++ pbibuild/modules/iourbanterror/build.sh	2009-01-22 20:31:22 UTC (rev 3317)
@@ -8,9 +8,3 @@
 # MODULEDIR = The location of the module directory for this PBI
 #   PORTVER = Version number of the port we used to build
 ##############################################################################
-# Save the right version number in the removepbi.sh script
-sed -e "s,CHANGEME,ioUrbanTerror${PORTVER},g" ${PBIDIR}/scripts/removepbi.sh > /tmp/removepbi.sh
-mv /tmp/removepbi.sh ${PBIDIR}/scripts/removepbi.sh
-chmod 755 ${PBIDIR}/scripts/removepbi.sh
-
-

Modified: pbibuild/modules/iourbanterror/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/iourbanterror/overlay-dir/PBI.FirstRun.sh	2009-01-22 20:08:59 UTC (rev 3316)
+++ pbibuild/modules/iourbanterror/overlay-dir/PBI.FirstRun.sh	2009-01-22 20:31:22 UTC (rev 3317)
@@ -15,43 +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/ioUrbanTerror" ]
-then
-    # Looks like FF is installed, ask if they want to remove the old one
-    ls -al /usr/local/bin/ioUrbanTerror | grep Programs 2>/dev/null
-    if [ "$?" = "0" ]
-    then
-      kdialog --yesno "ioUrbanTerror is already installed, do you wish to uninstall it?" 
-      if [ "$?" = "0" ]
-      then
-        FF="`ls -al /usr/local/bin/ioUrbanTerror | cut -d '>' -f 2 | cut -d "/" -f 3`"
-        echo $FF | grep ioUrbanTerror 2>/dev/null
-        if [ "$?" = "0" ]
-        then
-          PBIdelete -remove ${FF}
-        else
-          kdialog --sorry "ioUrbanTerror could not be automatically removed... Please remove it in Add / Remove Programs and try again."
-          return 2
-        fi
-      else
-        kdialog --sorry "ioUrbanTerror 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 "ioUrbanTerror is already installed, it must be uninstalled before loading this PBI"
-      return 2
-    fi
-fi 
-#3D APPLICATION: 3D ACC IS NEEDED
-
-glxinfo | grep "direct rendering:" | grep " Yes" 2>/dev/null
-if [ "$?" != "0" ]
-then
-   kdialog --msgbox "Your system does not appear to have hardware 3D
-support enabled. This application requires 3D acceleration to function
-properly."
-fi
\ No newline at end of file

Modified: pbibuild/modules/iourbanterror/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/iourbanterror/overlay-dir/PBI.RemoveScript.sh	2009-01-22 20:08:59 UTC (rev 3316)
+++ pbibuild/modules/iourbanterror/overlay-dir/PBI.RemoveScript.sh	2009-01-22 20:31:22 UTC (rev 3317)
@@ -6,12 +6,6 @@
 # ${2} is the username of person performing the deletion.
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
-rm -fR /usr/local/bin/ioUrbanTerror
-rm -fR /usr/local/bin/ioUrbanTerror-smp
-rm -fR /usr/local/bin/ioUrTded
-rm -fR /usr/local/share/doc/iourbanterror
-rm -fR /usr/local/share/doc/urbanterror
-rm -fR /usr/local/share/quake3/q3ut4
 if [ ! -z "$DISPLAY" ]
 then
  # Ask if we want to remove the user profiles

Modified: pbibuild/modules/iourbanterror/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/iourbanterror/overlay-dir/PBI.SetupScript.sh	2009-01-22 20:08:59 UTC (rev 3316)
+++ pbibuild/modules/iourbanterror/overlay-dir/PBI.SetupScript.sh	2009-01-22 20:31:22 UTC (rev 3317)
@@ -14,17 +14,13 @@
 # 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/ioUrbanTerror /usr/local/bin/ioUrbanTerror
-ln -s /Programs/${PROGDIR}/.sbin/ioUrbanTerror-smp /usr/local/bin/ioUrbanTerror-smp
-ln -s /Programs/${PROGDIR}/.sbin/ioUrTded /usr/local/bin/ioUrTded
-ln -s /Programs/${PROGDIR}/share/doc/iourbanterror /usr/local/share/doc/iourbanterror
-ln -s /Programs/${PROGDIR}/share/doc/urbanterror /usr/local/share/doc/urbanterror
-#ln -s /Programs/${PROGDIR}/share/quake3 /usr/local/share/quake3
-   if [ -e "/usr/local/share/quake3" ]
-   then
-   ln -s /Programs/${PROGDIR}/share/quake3/q3ut4 /usr/local/share/quake3/q3ut4
-   else
-   mkdir /usr/local/share/quake3
-   ln -s /Programs/${PROGDIR}/share/quake3/q3ut4 /usr/local/share/quake3/q3ut4
-   fi
-echo "LAUNCHCLOSE: /usr/local/bin/ioUrbanTerror-smp"
+
+# 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/ioUrbanTerror-smp"

Modified: pbibuild/modules/iourbanterror/pbi.conf
===================================================================
--- pbibuild/modules/iourbanterror/pbi.conf	2009-01-22 20:08:59 UTC (rev 3316)
+++ pbibuild/modules/iourbanterror/pbi.conf	2009-01-22 20:31:22 UTC (rev 3317)
@@ -32,7 +32,7 @@
 
 # Build Key - Change this to anything else to trigger a rebuild 
 #           - The rebuild will take place even if port is still the same ver
-BUILDKEY="05"
+BUILDKEY="01"
 
 # Don't build this PBI on certian processors (i386 / amd64)
 ARCHIGNORE="amd64" ; export ARCHIGNORE



More information about the Commits mailing list