Changeset 1879

Timestamp:

05/09/08 07:23:05 (3 months ago)

Author:

gonzalo

Message:

WinRAR fixes

Location:

pbibuild/modules/winrar

Files:

• overlay-dir/PBI.RemoveScript.sh (modified) (1 diff)
• overlay-dir/PBI.SetupScript.sh (modified) (1 diff)
• overlay-dir/bin/winrarpath (deleted)
• overlay-dir/winrar.desktop (modified) (7 diffs)
• pbi.conf (modified) (1 diff)

pbibuild/modules/winrar/overlay-dir/PBI.RemoveScript.sh

@@ -8 +8 @@
 #########################################
 rm -fR /usr/local/bin/winrar
-rm -fR /usr/local/bin/winrarpath
 rm -fR /usr/local/share/icons/*/*/mimetypes/winrar.png
 #remove the new winrar.desktop entry to all users

pbibuild/modules/winrar/overlay-dir/PBI.SetupScript.sh

@@ -16 +16 @@
 #########################################
 ln -s /Programs/${PROGDIR}/.sbin/winrar /usr/local/bin/winrar
-ln -s /Programs/${PROGDIR}/.sbin/winrarpath /usr/local/bin/winrarpath
 chmod -R 777 /Programs/${PROGDIR}/WINRAR
 chmod +x /Programs/${PROGDIR}/bin/winrar

pbibuild/modules/winrar/overlay-dir/winrar.desktop

@@ -14 +14 @@
 Name[de]=Öffnen mit Winrar
 Icon=winrar
-Exec=winrar "`winrarpath -w %f`"
+Exec=winrar "`/Programs/WinRAR0.9.61/bin/winepath -w %f`"
 
 
@@ -26 +26 @@
 Name[de]=Hier entpacken
 Icon=winrar
-Exec=cd %D ; rm -R ./.winerartmp;mkdir ./.winerartmp/;ln -s %F ./.winerartmp;winrar x -iext -ow -ver  "`winrarpath -w ./.winerartmp/`*.*" "`winrarpath -w ./`" ; rm -R ./.winerartmp
+Exec=cd %D ; rm -R ./.winerartmp;mkdir ./.winerartmp/;ln -s %F ./.winerartmp;winrar x -iext -ow -ver  "`/Programs/WinRAR0.9.61/bin/winepath -w ./.winerartmp/`*.*" "`/Programs/WinRAR0.9.61/bin/winepath -w ./`" ; rm -R ./.winerartmp
 
 
@@ -38 +38 @@
 Name[de]=Entpacken in Ordner
 Icon=winrar
-Exec=cd %D ; rm -R ./.winerartmp;mkdir ./.winerartmp/;ln -s %F ./.winerartmp;winrar x -ow -ver -ad "`winrarpath -w ./.winerartmp/`*.*" "`winrarpath -w ./`" ; rm -R ./.winerartmp
+Exec=cd %D ; rm -R ./.winerartmp;mkdir ./.winerartmp/;ln -s %F ./.winerartmp;winrar x -ow -ver -ad "`/Programs/WinRAR0.9.61/bin/winepath -w ./.winerartmp/`*.*" "`/Programs/WinRAR0.9.61/bin/winepath -w ./`" ; rm -R ./.winerartmp
 
 
@@ -50 +50 @@
 Name[de]=Entpacken nach...
 Icon=winrar
-Exec=cd %D ; rm -R ./.winerartmp;mkdir ./.winerartmp/;ln -s %F ./.winerartmp;winrar x -iext -ow -ver -- "`winrarpath -w ./.winerartmp/`*.*" '?\' ; rm -R ./.winerartmp
+Exec=cd %D ; rm -R ./.winerartmp;mkdir ./.winerartmp/;ln -s %F ./.winerartmp;winrar x -iext -ow -ver -- "`/Programs/WinRAR0.9.61/bin/winepath -w ./.winerartmp/`*.*" '?\' ; rm -R ./.winerartmp
 
 
@@ -62 +62 @@
 Name[de]=Schnell komprimieren
 Icon=winrar
-Exec=cd %D ; rm -R ./.winerartmp;mkdir ./.winerartmp/;ln -s %F ./.winerartmp;winrar a -r -ep1 -iext "`kdialog --inputbox 'Please, enter the archive name' \`basename %F\`  `".rar "`winrarpath -w ./.winerartmp/`*" ; rm -R ./.winerartmp
+Exec=cd %D ; rm -R ./.winerartmp;mkdir ./.winerartmp/;ln -s %F ./.winerartmp;winrar a -r -ep1 -iext "`kdialog --inputbox 'Please, enter the archive name' \`basename %F\`  `".rar "`/Programs/WinRAR0.9.61/bin/winepath -w ./.winerartmp/`*" ; rm -R ./.winerartmp
 
 
@@ -74 +74 @@
 Name[de]=Komprimieren...
 Icon=winrar
-Exec=cd %D ; rm -R ./.winerartmp;mkdir ./.winerartmp/;ln -s %F ./.winerartmp;winrar a -r -iext -ep1 -- . "`winrarpath -w ./.winerartmp/`*" ; rm -R ./.winerartmp
+Exec=cd %D ; rm -R ./.winerartmp;mkdir ./.winerartmp/;ln -s %F ./.winerartmp;winrar a -r -iext -ep1 -- . "`/Programs/WinRAR0.9.61/bin/winepath -w ./.winerartmp/`*" ; rm -R ./.winerartmp
 
 
@@ -86 +86 @@
 Name[de]=Archiv reparieren
 Icon=winrar
-Exec=cd %D ;winrar R "`winrarpath -w %f`"
+Exec=cd %D ;winrar R "`/Programs/WinRAR0.9.61/bin/winepath -w %f`"

pbibuild/modules/winrar/pbi.conf

@@ -33 +33 @@
 # 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="06"
 
 # Don't build this PBI on certian processors (i386 / amd64)