diff --git a/usr/bin/jgdeskgrid b/usr/bin/jgdeskgrid index ece85e6..dfba90a 100755 --- a/usr/bin/jgdeskgrid +++ b/usr/bin/jgdeskgrid @@ -134,6 +134,7 @@ mkconfigfile cat < ${MENU_ITEMS} $(printf '%s\n' "${out[@]}") +. ~/.config/mabox/jgdeskgrid.csv $(printf '%s\n' "${out2[@]}") EOF @@ -142,6 +143,7 @@ jgmenu --config-file=${CONFIG_FILE} --csv-file=${MENU_ITEMS} 2>/dev/null exit 0 fi printf '%s\n' "${out[@]}" +cat ~/.config/mabox/jgdeskgrid.csv if [[ $1 == "-r" ]]; then printf '%s\n' "^sep()" diff --git a/usr/bin/jgdeskmngr b/usr/bin/jgdeskmngr index 3ee9a7d..1c02f4a 100755 --- a/usr/bin/jgdeskmngr +++ b/usr/bin/jgdeskmngr @@ -1,5 +1,5 @@ #!/bin/bash -# jgdeskmngr - pipemenu for deskmngr +# jgdeskmngr - pipemenu (or standalone dynamic menu) for deskmngr # SESSIONDIR="$HOME/.config/deskmngr/" @@ -108,7 +108,7 @@ out2+=("^tag(time)") out2+=("^sep($INTERVAL)") for i in 1 2 3 4 5; do out2+=("$(printf "%3s,%s" "$i" "mb-setvar waitsec=${i} $CONFIG_FILE;$me")");done ### RUN -if [ $1 == "-s" ]; then +if [ "$1" == "-s" ]; then . /usr/share/mb-jgtools/pipemenu-standalone.cfg . $HOME/.config/mabox/mabox.conf @@ -135,6 +135,7 @@ mkconfigfile cat << EOF > ${MENU_ITEMS} $(printf '%s\n' "${out[@]}") +. ~/.config/mabox/jgdeskmngr.csv $(printf '%s\n' "${out2[@]}") EOF @@ -144,10 +145,12 @@ exit 0 fi printf '%s\n' "${out[@]}" +cat ~/.config/mabox/jgdeskmngr.csv if [[ $1 == "-r" ]]; then printf '%s\n' "^sep()" printf '%s\n' "$REMOVE,mb-setvar places_jgdeskmngr=false;mb-jgtools places" fi + printf '%s\n' "${out2[@]}"