From: Nick Bowler <draconx@gmail.com>
Date: Sun, 20 Apr 2008 07:28:20 +0000 (-0400)
Subject: Move scripts into their own subdirectory.
X-Git-Url: http://git.draconx.ca/gitweb/fvwmconf.git/commitdiff_plain/471336367072773753063c23c9bcc86eca6353d6

Move scripts into their own subdirectory.
---

diff --git a/artemis/rootmenu b/artemis/rootmenu
index 9a62d01..3c2f626 100644
--- a/artemis/rootmenu
+++ b/artemis/rootmenu
@@ -42,6 +42,6 @@ ChangeMenuStyle MenuMPD MenuMPD
 DestroyFunc MakeMenuMPD
 AddToFunc   MakeMenuMPD
 + I DestroyMenu recreate MenuMPD
-+ I PipeRead "exec $[FVWM_USERDIR]/mpdmenu.pl --menu MenuMPD"
++ I PipeRead "exec $[FVWM_USERDIR]/scripts/mpdmenu.pl --menu MenuMPD"
 
 Mouse 3 R A Menu MenuFvwmRoot
diff --git a/atropos/rootmenu b/atropos/rootmenu
index 74001e8..f2786bb 100644
--- a/atropos/rootmenu
+++ b/atropos/rootmenu
@@ -45,6 +45,6 @@ ChangeMenuStyle MenuMPD MenuMPD
 DestroyFunc MakeMenuMPD
 AddToFunc   MakeMenuMPD
 + I DestroyMenu recreate MenuMPD
-+ I PipeRead "exec $[FVWM_USERDIR]/mpdmenu.pl --menu MenuMPD"
++ I PipeRead "exec $[FVWM_USERDIR]/scripts/mpdmenu.pl --menu MenuMPD"
 
 Mouse 3 R A Menu MenuFvwmRoot
diff --git a/common/modifier b/common/modifier
index ddfc535..c7b770d 100644
--- a/common/modifier
+++ b/common/modifier
@@ -13,4 +13,4 @@ DestroyFunc Mod_M3Func
 AddToFunc   Mod_M3Func
  + C Lower
  + D Maximize 100 0
- + M PipeRead '. $[FVWM_USERDIR]/resize.sh $[pointer.wx] $[pointer.wy] $[w.width] $[w.height]'
+ + M PipeRead '. $[FVWM_USERDIR]/scripts/resize.sh $[pointer.wx] $[pointer.wy] $[w.width] $[w.height]'
diff --git a/common/wallpaper b/common/wallpaper
index 5855f74..46a3e4d 100644
--- a/common/wallpaper
+++ b/common/wallpaper
@@ -15,7 +15,7 @@ DestroyFunc MakeMenuWallpaper
 AddToFunc   MakeMenuWallpaper
  + I DestroyMenu recreate MenuWallpaper
  + I AddToMenu MenuWallpaper Wallpaper Title
- + I PipeRead '. $[FVWM_USERDIR]/bgmenu.sh $[BGROOT] MenuWallpaper'
+ + I PipeRead '. $[FVWM_USERDIR]/scripts/bgmenu.sh $[BGROOT] MenuWallpaper'
 
 DestroyFunc SetWallpaper
 AddToFunc   SetWallpaper
diff --git a/bgmenu.sh b/scripts/bgmenu.sh
similarity index 93%
rename from bgmenu.sh
rename to scripts/bgmenu.sh
index 36d94f1..ec6ae8f 100755
--- a/bgmenu.sh
+++ b/scripts/bgmenu.sh
@@ -6,7 +6,7 @@
 
 menu="MenuWallpaper"
 func="SetWallpaper"
-thumber="$HOME/.fvwm/thumbnail.sh"
+thumber="$HOME/.fvwm/scripts/thumbnail.sh"
 
 if [ ! -d "$1" ]; then
 	echo "usage: $0 <directory> [menuname]" 1>&2
diff --git a/mpdmenu.pl b/scripts/mpdmenu.pl
similarity index 98%
rename from mpdmenu.pl
rename to scripts/mpdmenu.pl
index f88451d..2b593b0 100755
--- a/mpdmenu.pl
+++ b/scripts/mpdmenu.pl
@@ -138,7 +138,7 @@ if (defined $album) {
 		my $key      = $_;
 		my $a_album  = sanitise($key);
 
-		open THUMB, "-|", "$FVWM/thumbnail.sh",
+		open THUMB, "-|", "$FVWM/scripts/thumbnail.sh",
 		                         "--small", "--music", $albums{$key};
 		my $thumb = <THUMB>;
 		close THUMB;
@@ -234,7 +234,7 @@ if (defined $album) {
 		$t_artist = sanitise($t_artist);
 		$t_title  = sanitise($t_title);
 
-		open THUMB, "-|", "$FVWM/thumbnail.sh",
+		open THUMB, "-|", "$FVWM/scripts/thumbnail.sh",
 		                         "--small", "--music", $t_file;
 		my $thumb = <THUMB>;
 		close(THUMB);
@@ -276,7 +276,7 @@ if (defined $album) {
 	}
 	die("Failed data query\n") unless (keys(%entry) > 0);
 
-	open THUMB, "-|", "$FVWM/thumbnail.sh",
+	open THUMB, "-|", "$FVWM/scripts/thumbnail.sh",
 	                         "--image", "--music",  $entry{file};
 	my $thumb = <THUMB>;
 	my $scan  = <THUMB>;
diff --git a/resize.sh b/scripts/resize.sh
similarity index 100%
rename from resize.sh
rename to scripts/resize.sh
diff --git a/thumbnail.sh b/scripts/thumbnail.sh
similarity index 100%
rename from thumbnail.sh
rename to scripts/thumbnail.sh