[PC-BSD Commits] r17435 - in pbi/modules/nonport/minecraft: . resources/bin

[svn at pcbsd.org]

Author: kenmoore
Date: 2012-06-25 19:29:14 +0000 (Mon, 25 Jun 2012)
New Revision: 17435

Modified:
   pbi/modules/nonport/minecraft/pbi.conf
   pbi/modules/nonport/minecraft/resources/bin/minecraft.sh
Log:
Rebuild Minecraft PBI - updated wrapper script to set permissions on copied files and always copy the LWJGL libs over when starting the program.



Modified: pbi/modules/nonport/minecraft/pbi.conf
===================================================================
--- pbi/modules/nonport/minecraft/pbi.conf	2012-06-25 16:11:09 UTC (rev 17434)
+++ pbi/modules/nonport/minecraft/pbi.conf	2012-06-25 19:29:14 UTC (rev 17435)
@@ -6,7 +6,7 @@
 PBI_PROGWEB="http://www.minecraft.net"
 PBI_PROGAUTHOR="Mojang"
 PBI_PROGICON="minecraft-icon.png"
-PBI_PROGVERSION="1.0"
+PBI_PROGVERSION="1.0.1"
 
 # -- Port Information --
 PBI_MAKEPORT="games/lwjgl"
@@ -18,7 +18,7 @@
 PBI_REQUIRESROOT="NO"
 
 # -- Auto-build Configuration Options --
-PBI_BUILDKEY="00"
+PBI_BUILDKEY="01"
 PBI_AB_PRIORITY="01"
 PBI_AB_NOTMPFS="NO"
 

Modified: pbi/modules/nonport/minecraft/resources/bin/minecraft.sh
===================================================================
--- pbi/modules/nonport/minecraft/resources/bin/minecraft.sh	2012-06-25 16:11:09 UTC (rev 17434)
+++ pbi/modules/nonport/minecraft/resources/bin/minecraft.sh	2012-06-25 19:29:14 UTC (rev 17435)
@@ -9,11 +9,6 @@
 #Check if the libs within the user's .minecraft folder have been fixed yet
 if [ -d $USERMINEDIR ]; then
 
-   if [ ! -f ${USERMINEDIR}/.BSDlwjgl ]; then
-      echo "FALSE" > ${USERMINEDIR}/.BSDlwjgl
-   fi
-
-   if [ "`cat ${USERMINEDIR}/.BSDlwjgl`" != "TRUE" ]; then
       echo "Replacing the LWJGL libraries"
       if [ ! -d ${USERMINEDIR}/bin ]; then 
         mkdir ${USERMINEDIR}/bin
@@ -38,18 +33,15 @@
       #rm *.so
       if [ -f ${LIBDIR}/liblwjgl.so ]; then
         cp ${LIBDIR}/liblwjgl.so liblwjgl.so
+        chmod 666 liblwjgl.so
       else
         cp ${LIBDIR}/liblwjgl64.so liblwjgl64.so
+        chmod 666 liblwjgl64.so
       fi
 
       echo "Finished linking to FreeBSD libraries"
-      echo "TRUE" > ${USERMINEDIR}/.BSDlwjgl
-   else
-      echo "FreeBSD compiled LWJGL libs discovered"
-   fi
-
 else
-   zenity --info --text="Minecraft will need to be restarted once all the libraries have been initially downloaded in order to replace LWJGL with the FreeBSD-compiled version. If it should ever stop working (due to updates and such), simply delete the \".minecraft/.BSDlwjgl\" file in your home directory and restart Minecraft to repeat the patching process."
+   zenity --info --text="Minecraft will need to be restarted once all the libraries have been initially downloaded in order to replace LWJGL with the FreeBSD-compiled version."
 fi
 
 #Start minecraft