generalize dir naming using fvwm infostor
HEAD master4 files changed, 15 insertions, 20 deletions
diff --git a/bkgrd.fvwm b/bkgrd.fvwm
index 1e74726..3cae519 100644
--- a/bkgrd.fvwm
+++ b/bkgrd.fvwm
@@ -3,26 +3,17 @@
DestroyModuleConfig FvwmBacker*
-InfoStoreAdd bkgrd /home/neil/wallpapers
-
-
-###### Backgrounds #################################
-
-DestroyModuleConfig FvwmBacker*
-
-InfoStoreAdd bkgrd /home/neil/wallpapers
-
*FvwmBackerDesk 0 -solid darkgrey
*FvwmBackerDesk 1 -solid lightblue
*FvwmBackerDesk 2 -solid lightgreen
*FvwmBackerDesk 3 -solid lightgrey
-#*FvwmBacker: Command (Desk 0) Exec xli -onroot -fillscreen $[infostore.bkgrd]/japanese_garden___stairs-wallpaper-1680x1050.jpg
-#*FvwmBacker: Command (Desk 1) Exec xli -onroot -fillscreen $[infostore.bkgrd]/dense_forest-wallpaper-1920x1080.jpg
-#*FvwmBacker: Command (Desk 2) Exec xli -onroot -fillscreen $[infostore.bkgrd]/armenia_syunik_khustup_hayk_photography-wallpaper-1680x1050.jpg
-#*FvwmBacker: Command (Desk 3) Exec xli -onroot -fillscreen $[infostore.bkgrd]/green_forest_7-wallpaper-1920x1080.jpg
+#*FvwmBacker: Command (Desk 0) Exec xli -onroot -fillscreen $[infostore.wdir]/japanese_garden___stairs-wallpaper-1680x1050.jpg
+#*FvwmBacker: Command (Desk 1) Exec xli -onroot -fillscreen $[infostore.wdir]/dense_forest-wallpaper-1920x1080.jpg
+#*FvwmBacker: Command (Desk 2) Exec xli -onroot -fillscreen $[infostore.wdir]/armenia_syunik_khustup_hayk_photography-wallpaper-1680x1050.jpg
+#*FvwmBacker: Command (Desk 3) Exec xli -onroot -fillscreen $[infostore.wdir]/green_forest_7-wallpaper-1920x1080.jpg
## this one works too (deprecated format)
-#*FvwmBackerDesk 0 Exec xli -onroot -fillscreen /home/neil/wallpapers/steampunk_leagues.jpg
+#*FvwmBackerDesk 0 Exec xli -onroot -fillscreen $[infostore.wdir]/steampunk_leagues.jpg
diff --git a/config b/config
index d740435..d6c1770 100644
--- a/config
+++ b/config
@@ -1,4 +1,8 @@
+InfoStoreAdd wdir /home/neil/wallpapers
+InfoStoreAdd bdir /home/neil/bin
+InfoStoreAdd fdir /home/neil/fvwm.linked
+
# order matters
Read funcs.fvwm
diff --git a/menus-std.fvwm b/menus-std.fvwm
index 5038e76..77826e7 100644
--- a/menus-std.fvwm
+++ b/menus-std.fvwm
@@ -2,9 +2,9 @@
## standard/constant portion of menu config - same for all userids
AddToMenu ScratchPad
-+ "ScratchPad Add" Exec exec /home/neil/bin/spad.sh
-+ "ScratchPad Display" Exec exec /home/neil/bin/spad.sh -d
-+ "ScratchPad Clear" Exec exec /home/neil/bin/spad.sh -c
++ "ScratchPad Add" Exec exec $[infostore.bdir]/spad.sh
++ "ScratchPad Display" Exec exec $[infostore.bdir]/spad.sh -d
++ "ScratchPad Clear" Exec exec $[infostore.bdir]/spad.sh -c
+ "ScratchPad OverWrite" Exec exec xclip -o > /tmp/spad
+ "ScratchPad JustGrab" Exec exec xclip -i /tmp/spad
@@ -12,7 +12,7 @@ AddToMenu Fvwm-Options
+ "Fvwm Modules" Popup Module-Popup
+ "Fvwm Window Ops" Popup Window-Ops
+ "Fvwm Simple Config Ops" Popup Misc-Ops
-+ "fvwm config symlinker" Exec exec ~neil/fvwm.linked/symlinker.sh
++ "fvwm config symlinker" Exec exec $[infostore.fdir]/symlinker.sh
+ "" Nop
+ "Refresh Screen" Refresh
+ "Recapture Screen" Recapture
diff --git a/symlinker.sh b/symlinker.sh
index b1fd01d..799dc72 100755
--- a/symlinker.sh
+++ b/symlinker.sh
@@ -1,7 +1,7 @@
#!/bin/sh
-## execute this as some special user (e.g. dev, untrust,finan,...)
-## it creates symlinks to ~neil/fvwm.linked/{*.fvwm|config} and
+## execute this as some special user (e.g. dev, untrust, purch,...)
+## it creates symlinks to FVWM_TEMPLATE_DIR/{*.fvwm|config} and
## also handles customized symlinks (which are local) as long as they follow
## the naming convention of STDNAME.xxxxx.custom (e.g. menu-var.untrust.custom)
|