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

svn at pcbsd.org svn at pcbsd.org
Fri Sep 19 13:13:53 PDT 2008 

Author: kris
Date: 2008-09-19 13:13:53 -0700 (Fri, 19 Sep 2008)
New Revision: 2803

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/winrar.desktop
Log:

Fixed the winrar3 to use service menus for KDE4 now



Modified: pbibuild/modules/winrar3/build.sh
===================================================================
--- pbibuild/modules/winrar3/build.sh	2008-09-19 18:15:49 UTC (rev 2802)
+++ pbibuild/modules/winrar3/build.sh	2008-09-19 20:13:53 UTC (rev 2803)
@@ -13,3 +13,7 @@
 sed -e "s,CHANGEME,${PORTVER},g" ${PBIDIR}/bin/winrar > /tmp/winrar
 mv /tmp/winrar ${PBIDIR}/bin/winrar
 chmod 755 ${PBIDIR}/bin/winrar
+
+# Save the right version number in the winrar.desktop file
+sed -e "s,CHANGEME,${PORTVER},g" ${PBIDIR}/winrar.desktop > /tmp/winrar.desktop
+mv /tmp/winrar.desktop ${PBIDIR}/winrar.desktop

Modified: pbibuild/modules/winrar3/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/winrar3/overlay-dir/PBI.RemoveScript.sh	2008-09-19 18:15:49 UTC (rev 2802)
+++ pbibuild/modules/winrar3/overlay-dir/PBI.RemoveScript.sh	2008-09-19 20:13:53 UTC (rev 2803)
@@ -8,13 +8,13 @@
 #########################################
 rm -fR /usr/local/bin/winrar
 rm -fR /usr/local/share/icons/*/*/mimetypes/winrar.png
+rm -fR /usr/local/kde4/share/kde4/services/ServiceMenus/winrar.desktop
 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-19 18:15:49 UTC (rev 2802)
+++ pbibuild/modules/winrar3/overlay-dir/PBI.SetupScript.sh	2008-09-19 20:13:53 UTC (rev 2803)
@@ -17,11 +17,6 @@
 ln -s /Programs/${PROGDIR}/.sbin/winrar /usr/local/bin/winrar
 chmod -R 777 /Programs/${PROGDIR}/WINRAR
 chmod +x /Programs/${PROGDIR}/bin/winrar
-#copy the new winrar.desktop entry to all users
-  cd /home
-  for i in `ls`
-  do
-    ln -s /Programs/${PROGDIR}/winrar.desktop  /home/${i}/.kde/share/apps/konqueror/servicemenus/
-  done
+ln -s /Programs/${PROGDIR}/winrar.desktop  /usr/local/kde4/share/kde4/services/ServiceMenus/winrar.desktop
 ln -s /Programs/${PROGDIR}/share/pixmaps/winrar.png /usr/local/share/icons/hicolor/32x32/mimetypes/winrar.png
 echo "LAUNCHCLOSE: /usr/local/bin/winrar"

Modified: pbibuild/modules/winrar3/overlay-dir/winrar.desktop
===================================================================
--- pbibuild/modules/winrar3/overlay-dir/winrar.desktop	2008-09-19 18:15:49 UTC (rev 2802)
+++ pbibuild/modules/winrar3/overlay-dir/winrar.desktop	2008-09-19 20:13:53 UTC (rev 2803)
@@ -1,8 +1,8 @@
 [Desktop Entry]
-ServiceTypes=all/all
+Type=Service
+ServiceTypes=KonqPopupMenu/Plugin
+MimeType=all/all
 Actions=Open_With;_SEPARATOR_;Extract_Here;Extract_Sub;Extract_files;_SEPARATOR_;QuickCompress;Compress_files;_SEPARATOR_;Repair
-X-KDE-Submenu=WinRAR
-X-KDE-Priority=TopLevel 
 
 
 [Desktop Action Open_With]
@@ -13,7 +13,7 @@
 Name[pl]=Otwórz w Winrar
 Name[de]=Öffnen mit Winrar
 Icon=winrar
-Exec=winrar "`/Programs/WinRAR1.0/bin/winepath -w %f`"
+Exec=winrar "`/Programs/WinRARCHANGEME/bin/winepath -w %f`"
 
 
 
@@ -25,7 +25,7 @@
 Name[pl]=Wypakuj tutaj
 Name[de]=Hier entpacken
 Icon=winrar
-Exec=cd %D ; rm -R ./.winerartmp;mkdir ./.winerartmp/;ln -s %F ./.winerartmp;winrar x -iext -ow -ver  "`/Programs/WinRAR1.0/bin/winepath -w ./.winerartmp/`*.*" "`/Programs/WinRAR1.0/bin/winepath -w ./`" ; rm -R ./.winerartmp
+Exec=cd %D ; rm -R ./.winerartmp;mkdir ./.winerartmp/;ln -s %F ./.winerartmp;winrar x -iext -ow -ver  "`/Programs/WinRARCHANGEME/bin/winepath -w ./.winerartmp/`*.*" "`/Programs/WinRARCHANGEME/bin/winepath -w ./`" ; rm -R ./.winerartmp
 
 
 
@@ -37,7 +37,7 @@
 Name[pl]=Wypakuj do folderu
 Name[de]=Entpacken in Ordner
 Icon=winrar
-Exec=cd %D ; rm -R ./.winerartmp;mkdir ./.winerartmp/;ln -s %F ./.winerartmp;winrar x -ow -ver -ad "`/Programs/WinRAR1.0/bin/winepath -w ./.winerartmp/`*.*" "`/Programs/WinRAR1.0/bin/winepath -w ./`" ; rm -R ./.winerartmp
+Exec=cd %D ; rm -R ./.winerartmp;mkdir ./.winerartmp/;ln -s %F ./.winerartmp;winrar x -ow -ver -ad "`/Programs/WinRARCHANGEME/bin/winepath -w ./.winerartmp/`*.*" "`/Programs/WinRARCHANGEME/bin/winepath -w ./`" ; rm -R ./.winerartmp
 
 
 
@@ -49,7 +49,7 @@
 Name[pl]=Wypakuj pliki...
 Name[de]=Entpacken nach...
 Icon=winrar
-Exec=cd %D ; rm -R ./.winerartmp;mkdir ./.winerartmp/;ln -s %F ./.winerartmp;winrar x -iext -ow -ver -- "`/Programs/WinRAR1.0/bin/winepath -w ./.winerartmp/`*.*" '?\' ; rm -R ./.winerartmp
+Exec=cd %D ; rm -R ./.winerartmp;mkdir ./.winerartmp/;ln -s %F ./.winerartmp;winrar x -iext -ow -ver -- "`/Programs/WinRARCHANGEME/bin/winepath -w ./.winerartmp/`*.*" '?\' ; rm -R ./.winerartmp
 
 
 
@@ -61,7 +61,7 @@
 Name[pl]=Szybka kompresja
 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 "`/Programs/WinRAR1.0/bin/winepath -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/WinRARCHANGEME/bin/winepath -w ./.winerartmp/`*" ; rm -R ./.winerartmp
 
 
 
@@ -73,7 +73,7 @@
 Name[pl]=Kompresuj...
 Name[de]=Komprimieren...
 Icon=winrar
-Exec=cd %D ; rm -R ./.winerartmp;mkdir ./.winerartmp/;ln -s %F ./.winerartmp;winrar a -r -iext -ep1 -- . "`/Programs/WinRAR1.0/bin/winepath -w ./.winerartmp/`*" ; rm -R ./.winerartmp
+Exec=cd %D ; rm -R ./.winerartmp;mkdir ./.winerartmp/;ln -s %F ./.winerartmp;winrar a -r -iext -ep1 -- . "`/Programs/WinRARCHANGEME/bin/winepath -w ./.winerartmp/`*" ; rm -R ./.winerartmp
 
 
 
@@ -85,4 +85,4 @@
 Name[pl]=Napraw archiwum
 Name[de]=Archiv reparieren
 Icon=winrar
-Exec=cd %D ;winrar R "`/Programs/WinRAR1.0/bin/winepath -w %f`"
+Exec=cd %D ;winrar R "`/Programs/WinRARCHANGEME/bin/winepath -w %f`"

More information about the Commits mailing list