[PC-BSD Commits] r15507 - in pbi/modules/games/spring: . resources/bin scripts

[svn at pcbsd.org]

Author: kenmoore
Date: 2012-02-21 18:54:34 +0000 (Tue, 21 Feb 2012)
New Revision: 15507

Removed:
   pbi/modules/games/spring/scripts/post-portmake.sh
Modified:
   pbi/modules/games/spring/pbi.conf
   pbi/modules/games/spring/resources/bin/spring.sh
   pbi/modules/games/spring/scripts/post-install.sh
Log:
Fix the spring post-install script and wrapper script and rebuild



Modified: pbi/modules/games/spring/pbi.conf
===================================================================
--- pbi/modules/games/spring/pbi.conf	2012-02-21 18:23:43 UTC (rev 15506)
+++ pbi/modules/games/spring/pbi.conf	2012-02-21 18:54:34 UTC (rev 15507)
@@ -26,6 +26,6 @@
 PBI_MKPORTAFTER="lang/lua
 games/springlobby"
 
-PBI_BUILDKEY="04"; export PBI_BUILDKEY
+PBI_BUILDKEY="05"; export PBI_BUILDKEY
  
 export PBI_PROGNAME PBI_PROGWEB PBI_PROGAUTHOR PBI_PROGICON PBI_MAKEPORT PBI_MKPORTBEFORE PBI_MKPORTAFTER

Modified: pbi/modules/games/spring/resources/bin/spring.sh
===================================================================
--- pbi/modules/games/spring/resources/bin/spring.sh	2012-02-21 18:23:43 UTC (rev 15506)
+++ pbi/modules/games/spring/resources/bin/spring.sh	2012-02-21 18:54:34 UTC (rev 15507)
@@ -6,10 +6,10 @@
 NUM=`ls ${PROGDIR}/share/spring/mods | wc -l | tr -d ' '`
 if [ "${NUM}" = "0" ]
 then
-   kdialog --warningyesno "The ${PROGDIR}/share/spring/mods folder does not contain any games. Do you wish to open a browser to the games list?"
+   zenity --question --text="The ${PROGDIR}/share/spring/mods folder does not contain any games. Do you wish to open a browser to the games list?"
    if [ "$?" = "0" ]
    then
-      konqueror http://spring.clan-sy.com/
+      openwith http://spring.clan-sy.com/
       exit 0
    fi
 fi
@@ -18,10 +18,10 @@
 NUM=`ls ${PROGDIR}/share/spring/maps | wc -l | tr -d ' '`
 if [ "${NUM}" = "0" ]
 then
-   kdialog --warningyesno "The ${PROGDIR}/share/spring/maps folder does not contain any maps. Do you wish to open a browser to the games list?"
+   zenity --question --text="The ${PROGDIR}/share/spring/maps folder does not contain any maps. Do you wish to open a browser to the games list?"
    if [ "$?" = "0" ]
    then
-      konqueror http://spring.clan-sy.com/
+      openwith http://spring.clan-sy.com/
       exit 0
    fi
 fi

Modified: pbi/modules/games/spring/scripts/post-install.sh
===================================================================
--- pbi/modules/games/spring/scripts/post-install.sh	2012-02-21 18:23:43 UTC (rev 15506)
+++ pbi/modules/games/spring/scripts/post-install.sh	2012-02-21 18:54:34 UTC (rev 15507)
@@ -1,13 +1,4 @@
 #!/bin/sh
 
-#mkdir -p /Programs/share/spring/maps
-#mkdir -p /Programs/share/spring/mods
-
-#chmod 777 /Programs/share/spring/maps
-#chmod 777 /Programs/share/spring/mods
-
-#rm -rf ${PBI_PROGDIRPATH}/share/spring/maps
-#rm -rf ${PBI_PROGDIRPATH}/share/spring/mods
-
-#ln -s /Programs/share/spring/mods ${PBI_PROGDIRPATH}/share/spring/mods
-#ln -s /Programs/share/spring/maps ${PBI_PROGDIRPATH}/share/spring/maps
+sed -i.bak "s,CHANGEME,${PBI_TARGETFULLDIR},g" ${PBI_PROGDIRPATH}/bin/spring.sh
+chmod 755 ${PBI_PROGDIRPATH}/bin/*