Use InfoStore instead of polluting the environment.

2 files changed, 8 insertions, 6 deletions

diff --git a/scripts/midclick_menu.sh b/scripts/midclick_menu.sh
index 90fa578..8af6a48 100755
--- a/scripts/midclick_menu.sh
+++ b/scripts/midclick_menu.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 #i=$(cat ${FVWM_USERDIR}/config-options/desktop_size)
-i=1x$[fvwm_config_num_pages]
+num_pages=$1
+shift 1
+i=1x${num_pages}
 j=${i}
 
 i=${i%x*}
diff --git a/scripts/random_wallpaper.py b/scripts/random_wallpaper.py
index fa9fd5d..aed95bd 100755
--- a/scripts/random_wallpaper.py
+++ b/scripts/random_wallpaper.py
@@ -8,11 +8,11 @@ import os.path
 import sys
 import random
 
-if not 'WALLPAPERDIR' in os.environ:
-    sys.stderr.write('WALLPAPERDIR variable not set, using default value.\n')
-    d = os.path.expandvars('${HOME}/${FVWM_USERDIR}/images')
-else:
-    d = os.path.expandvars('${WALLPAPERDIR}')
+if len(sys.argv) < 2:
+    sys.stderr.write('Usage: %s <wallpaper_dir>\n'%(sys.argv[0]))
+    sys.exit(-1)
+
+d = os.path.expandvars(sys.argv[1])
 
 sys.stderr.write('Trying directory %s.\n'%d)
 if not os.path.isdir(d):