[PC-BSD Commits] r2783 - in pbibuild/modules/winrar3: . overlay-dir overlay-dir/bin

svn at pcbsd.org svn at pcbsd.org
Wed Sep 17 08:44:48 PDT 2008


Author: gonzalo
Date: 2008-09-17 08:44:48 -0700 (Wed, 17 Sep 2008)
New Revision: 2783

Removed:
   pbibuild/modules/winrar3/overlay-dir/WINRAR/
Modified:
   pbibuild/modules/winrar3/build.sh
   pbibuild/modules/winrar3/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/winrar3/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/winrar3/overlay-dir/bin/winrar
   pbibuild/modules/winrar3/pbi.conf
Log:
WinRAR preparation

Modified: pbibuild/modules/winrar3/build.sh
===================================================================
--- pbibuild/modules/winrar3/build.sh	2008-09-17 15:41:31 UTC (rev 2782)
+++ pbibuild/modules/winrar3/build.sh	2008-09-17 15:44:48 UTC (rev 2783)
@@ -9,12 +9,7 @@
 #   PORTVER = Version number of the port we used to build
 ##############################################################################
 
-# Save the right version number in the winfirefox3 script
+# Save the right version number in the winrar script
 sed -e "s,CHANGEME,${PORTVER},g" ${PBIDIR}/bin/winrar > /tmp/winrar
-mv /tmp/winrar ${PBIDIR}/bin/winrar
+mv /tmp/winrar ${PBIDIR}/bin/winrara
 chmod 755 ${PBIDIR}/bin/winrar
-
-# Save the right version number in the winfirefox3 script
-sed -e "s,CHANGEME,${PORTVER},g" ${PBIDIR}/bin/winraropen > /tmp/winraropen
-mv /tmp/winraropen ${PBIDIR}/bin/winraropen
-chmod 755 ${PBIDIR}/bin/winraropen

Modified: pbibuild/modules/winrar3/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/winrar3/overlay-dir/PBI.RemoveScript.sh	2008-09-17 15:41:31 UTC (rev 2782)
+++ pbibuild/modules/winrar3/overlay-dir/PBI.RemoveScript.sh	2008-09-17 15:44:48 UTC (rev 2783)
@@ -8,9 +8,13 @@
 #########################################
 rm -fR /usr/local/bin/winrar
 rm -fR /usr/local/share/icons/*/*/mimetypes/winrar.png
-#remove the new winrar.desktop entry to all users
-  cd /home
-  for i in `ls`
-  do
-    rm -fR /home/${i}/.kde/share/apps/konqueror/servicemenus/winrar.desktop
-done
\ No newline at end of file
+cd /home
+for i in `ls`
+do
+if [ -e "/home/${i}/.winrar" ]
+then
+rm -rf /home/${i}/.winrar
+rm -fR /home/${i}/.kde/share/apps/konqueror/servicemenus/winrar.desktop
+fi
+done
+

Modified: pbibuild/modules/winrar3/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/winrar3/overlay-dir/PBI.SetupScript.sh	2008-09-17 15:41:31 UTC (rev 2782)
+++ pbibuild/modules/winrar3/overlay-dir/PBI.SetupScript.sh	2008-09-17 15:44:48 UTC (rev 2783)
@@ -17,8 +17,6 @@
 ln -s /Programs/${PROGDIR}/.sbin/winrar /usr/local/bin/winrar
 chmod -R 777 /Programs/${PROGDIR}/WINRAR
 chmod +x /Programs/${PROGDIR}/bin/winrar
-USER=`who | grep ' :0 ' | cut -f 1 -d " "`
-chown ${USER} /Programs/${PROGDIR}/WINRAR
 #copy the new winrar.desktop entry to all users
   cd /home
   for i in `ls`

Modified: pbibuild/modules/winrar3/overlay-dir/bin/winrar
===================================================================
--- pbibuild/modules/winrar3/overlay-dir/bin/winrar	2008-09-17 15:41:31 UTC (rev 2782)
+++ pbibuild/modules/winrar3/overlay-dir/bin/winrar	2008-09-17 15:44:48 UTC (rev 2783)
@@ -1,6 +1,16 @@
 #!/bin/sh
 VER="CHANGEME"
 PROGDIR="WinRAR${VER}"
-cd
-export WINEPREFIX="/Programs/${PROGDIR}/WINRAR"
-/Programs/${PROGDIR}/bin/wine "/Programs/${PROGDIR}/WINRAR/drive_c/Program Files/WinRAR/WinRAR.exe" "$@"
+
+if [ ! -e "${HOME}/.winrar" ]
+then
+  mkdir ${HOME}/.winrar
+  ln -s /Programs/${PROGDIR}/WINRAR/drive_c ${HOME}/.winrar/drive_c
+else
+  rm ${HOME}/.winrar/drive_c 
+  ln -s /Programs/${PROGDIR}/WINRAR/drive_c ${HOME}/.winrar/drive_c
+fi
+
+export WINEPREFIX="${HOME}/.winrar"
+/Programs/${PROGDIR}/bin/wine "${HOME}/.winrar/drive_c/Program Files/WinRAR/WinRAR.exe" "$@"
+

Modified: pbibuild/modules/winrar3/pbi.conf
===================================================================
--- pbibuild/modules/winrar3/pbi.conf	2008-09-17 15:41:31 UTC (rev 2782)
+++ pbibuild/modules/winrar3/pbi.conf	2008-09-17 15:44:48 UTC (rev 2783)
@@ -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="30"
+BUILDKEY="31"
 
 # Don't build this PBI on certian processors (i386 / amd64)
 ARCHIGNORE="amd64" ; export ARCHIGNORE



More information about the Commits mailing list