[PC-BSD Commits] r3288 - in pbibuild/modules/fish: . kmenu-dir overlay-dir

svn at pcbsd.org svn at pcbsd.org
Mon Jan 19 12:11:48 PST 2009


Author: kris
Date: 2009-01-19 12:11:44 -0800 (Mon, 19 Jan 2009)
New Revision: 3288

Added:
   pbibuild/modules/fish/kmenu-dir/fish
   pbibuild/modules/fish/overlay-dir/fish.png
Removed:
   pbibuild/modules/fish/kmenu-dir/abiword
   pbibuild/modules/fish/overlay-dir/LICENSE
Modified:
   pbibuild/modules/fish/build.sh
   pbibuild/modules/fish/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/fish/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/fish/pbi.conf
Log:

Updated fish, 100% self-contained, and works properly now. Needs new install images from Gonzalo still



Modified: pbibuild/modules/fish/build.sh
===================================================================
--- pbibuild/modules/fish/build.sh	2009-01-19 19:42:26 UTC (rev 3287)
+++ pbibuild/modules/fish/build.sh	2009-01-19 20:11:44 UTC (rev 3288)
@@ -8,15 +8,3 @@
 # MODULEDIR = The location of the module directory for this PBI
 #   PORTVER = Version number of the port we used to build
 ##############################################################################
-# Get all the various language files and copy them to the PBI
-LANGFILE="fish.mo"
-mkdir ${PBIDIR}/locale/
-cd /usr/local/share/locale
-for i in `ls`
-do
-  if [ -e "/usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE}" ]
-  then
-    mkdir ${PBIDIR}/locale/${i}
-    cp /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE} ${PBIDIR}/locale/${i}/
-  fi
-done
\ No newline at end of file

Modified: pbibuild/modules/fish/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/fish/overlay-dir/PBI.RemoveScript.sh	2009-01-19 19:42:26 UTC (rev 3287)
+++ pbibuild/modules/fish/overlay-dir/PBI.RemoveScript.sh	2009-01-19 20:11:44 UTC (rev 3288)
@@ -6,18 +6,8 @@
 # ${2} is the username of person performing the deletion.
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
-rm -fR /usr/local/bin/fish
-rm -fR /usr/local/etc/fish
-rm -fR /usr/local/share/doc/fish
-rm -fR /usr/local/share/fish
 
-# Remove the old locale files since we are uninstalling
-LANGFILE="fish.mo"
-cd /Programs/${PROGDIR}/locale
-for i in `ls`
-do
-  rm /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE}
-done
+rm /usr/local/bin/fish
 
 if [ ! -z "$DISPLAY" ]
 then

Modified: pbibuild/modules/fish/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/fish/overlay-dir/PBI.SetupScript.sh	2009-01-19 19:42:26 UTC (rev 3287)
+++ pbibuild/modules/fish/overlay-dir/PBI.SetupScript.sh	2009-01-19 20:11:44 UTC (rev 3288)
@@ -14,17 +14,16 @@
 # 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/fish /usr/local/bin/fish
-ln -s /Programs/${PROGDIR}/etc/fish /usr/local/etc/fish
-ln -s /Programs/${PROGDIR}/share/doc/fish /usr/local/share/doc/fish
-ln -s /Programs/${PROGDIR}/share/fish /usr/local/share/fish
 
-# Copy over all the LANG files
-LANGFILE="fish.mo"
-cd /Programs/${PROGDIR}/locale
-for i in `ls`
-do
-  mkdir -p /usr/local/share/locale/${i}/LC_MESSAGES >/dev/null 2>/dev/null
-  cp /Programs/${PROGDIR}/locale/${i}/${LANGFILE} /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE}
-done
-echo "LAUNCHCLOSE: /usr/local/bin/fish"
+# 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
+
+
+ln -fs /Programs/${PROGDIR}/.sbin/fish /usr/local/bin/fish
+
+echo "LAUNCHCLOSE: konsole /Programs/bin/fish"


Property changes on: pbibuild/modules/fish/overlay-dir/fish.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: pbibuild/modules/fish/pbi.conf
===================================================================
--- pbibuild/modules/fish/pbi.conf	2009-01-19 19:42:26 UTC (rev 3287)
+++ pbibuild/modules/fish/pbi.conf	2009-01-19 20:11:44 UTC (rev 3288)
@@ -13,7 +13,7 @@
 PROGAUTHOR="The FISH Team"
 
 # Default Icon (Relative to overlay-dir)
-PROGICON="share/pixmaps/fish.png"
+PROGICON="fish.png"
 
 # Port we want to build
 PBIPORT="/usr/ports/shells/fish"
@@ -32,6 +32,6 @@
 
 # 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="01"
+BUILDKEY="05"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY



More information about the Commits mailing list