Fixes in JWM Saluki

mavrothal · Feb 26, 2012 · 3b5a8c1 · 3b5a8c1
1 parent 5f926d3
commit 3b5a8c1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/XO/XO_sfs_patches/jwmrc-tray_luki.patch b/XO/XO_sfs_patches/jwmrc-tray_luki.patch
@@ -1,14 +1,10 @@
 --- a/root/.jwmrc-tray	2010-05-24 09:41:41.000000000 +0300
 +++ b/root/.jwmrc-tray	2012-02-26 09:06:16.146554246 +0200
-@@ -14,8 +14,10 @@
+@@ -13,6 +13,8 @@
+
  		<!-- Additional TaskList attribute: maxwidth -->
  		<TaskList/>
-
-+		<TrayButton popup="Mount devices" icon="/usr/share/icons/gnome/24x24/devices/gnome-dev-removable.png">exec:pmount</TrayButton>
 +		
- 		<Dock/>
--
-+		
- 		<!-- Additional Swallow attribute: height -->
++		<TrayButton popup="Mount devices" icon="/usr/share/icons/gnome/24x24/devices/gnome-dev-removable.png">exec:pmount</TrayButton>
 
- 	<!--	<Swallow name="blinky">
+ 		<Dock/>
diff --git a/create_xo_puppy.sh b/create_xo_puppy.sh
@@ -641,7 +641,7 @@ else
 fi
 
 #Add pmount in the tray
-patch -p1 < $patches/jwm-tray_luki.patch
+patch -p1 < $patches/jwmrc-tray_luki.patch
 if [ $? -ne 0 ]; then
 	echo "Failed to Patch .jwmrc-tray for Saluki . $(date "+%Y-%m-%d %H:%M")" >> $CWD/build.log
 	rm -f root/.jwmrc-tray.{orig,rej}
@@ -650,12 +650,12 @@ else
 fi
 
 # reload instead of restart JWM
-sed -i "s/jwm -restart/jwm -reload/" /usr/local/petget/installpreview.sh 
-sed -i "s/jwm -restart/jwm -reload/" /usr/local/petget/removepreview.sh  
-sed -i "s/jwm -restart/jwm -reload/" /usr/local/petget/petget 
+sed -i "s/jwm -restart/jwm -reload/" $SFSROOT/usr/local/petget/installpreview.sh 
+sed -i "s/jwm -restart/jwm -reload/" $SFSROOT/usr/local/petget/removepreview.sh  
+sed -i "s/jwm -restart/jwm -reload/" $SFSROOT/usr/local/petget/petget 
 
 # Further increase font size
-sed -i 's/108/130/' $SFSROOT/root/.Xresources
+sed -i 's/108/130/' $XOSFS/root/.Xresources
 
 # Show file/folder icons in Thunar when in JWM
 echo "patching xwin"