diff --git a/usr/bin/jgconky-pipe b/usr/bin/jgconky-pipe index f47c693..44ab00c 100755 --- a/usr/bin/jgconky-pipe +++ b/usr/bin/jgconky-pipe @@ -106,7 +106,7 @@ out+=("^sep($SESSIONS_LBL)") if type "$CSESSION" &>/dev/null;then # mb-conky-session script found out+=("^sep($SAVED_SESSIONS)") - if [ -e "$SESSIONS" ] + if [[ -e "$SESSIONS" ]] then while read -r session ;do [[ -z $session ]] && continue # skip if line is blank @@ -118,6 +118,37 @@ out+=("^sep($SESSIONS_LBL)") fi + +if [ $1 == "-s" ]; then +. /usr/bin/pipemenu-standalone.cfg +. $HOME/.config/mabox/mabox.conf +MENU_PADDING_TOP=0 +MENU_HALIGN="left" +MENU_VALIGN="center" +MENU_MARGIN_Y=40 +jgmenu_icon_size=0 +menu_margin_x=${submenu_spacing:-0} +[ $(pidof picom) ] && MENU_RADIUS=$jgtools_radius + +[ $(pidof picom) ] && MENU_RADIUS=$jgtools_radius +[ -z $jgmenu_use_borders ] && menu_border=0 + +mkconfigfile + +cat < ${MENU_ITEMS} + +$(printf '%s\n' "${out[@]}") +$(printf '%s\n' "${out2[@]}") +EOF + +jgmenu --config-file=${CONFIG_FILE} --csv-file=${MENU_ITEMS} 2>/dev/null + +exit 0 + +fi + + + printf '%s\n' "${out[@]}" diff --git a/usr/bin/jgespanso-pipe b/usr/bin/jgespanso-pipe index 4ff7fc7..5303344 100755 --- a/usr/bin/jgespanso-pipe +++ b/usr/bin/jgespanso-pipe @@ -32,7 +32,7 @@ trap "rm -f $MENU_ITEMS" EXIT if [[ $(espanso status) =~ "not" ]] then echo "^sep(Espanso - text expander)" >/tmp/espanso_list.csv - echo "Espanso not running! Run it first by: espanso start" >>/tmp/espanso_list.csv + echo "Espanso not running! Run it first by: espanso start,^term(espanso start)" >>/tmp/espanso_list.csv else echo "@search,,10,5,292,20,4,left,top,auto,#262626,\"\"\" $TYPE_TO_SEARCH\"\"\"" >/tmp/espanso_list.csv diff --git a/usr/bin/jgmenusettings-pipe b/usr/bin/jgmenusettings-pipe index a721f8e..9e88f85 100755 --- a/usr/bin/jgmenusettings-pipe +++ b/usr/bin/jgmenusettings-pipe @@ -228,7 +228,7 @@ out2+=("^sep($PIPEMENUS)") [[ $places_jgdeskmngr = false ]] && out2+=("$DESKMNGR,mb-setvar places_jgdeskmngr=true;$L") || out2+=("$DESKMNGR,mb-setvar places_jgdeskmngr=false;$L") [[ $places_jgdeskgrid = false ]] && out2+=("$DESKGRID,mb-setvar places_jgdeskgrid=true;$L") || out2+=("$DESKGRID,mb-setvar places_jgdeskgrid=false;$L") [[ $places_sysinfopipe = false ]] && out2+=("$SYSINFO,mb-setvar places_sysinfopipe=true;$L") || out2+=("$SYSINFO,mb-setvar places_sysinfopipe=false;$L") -[[ $places_keyspipe = false ]] && out2+=("$SHORTCUTS,mb-setvar places_keyspipe=true;$L") || out2+=("$SHORTCUTS,mb-setvar places_keyspipe=false;$L") +#[[ $places_keyspipe = false ]] && out2+=("$SHORTCUTS,mb-setvar places_keyspipe=true;$L") || out2+=("$SHORTCUTS,mb-setvar places_keyspipe=false;$L") [[ $places_sshpipe = false ]] && out2+=("$SSH_CONN,mb-setvar places_sshpipe=true;$L") || out2+=("$SSH_CONN,mb-setvar places_sshpipe=false;$L") [[ $places_softwarepipe = false ]] && out2+=("$POPINSTALL,mb-setvar places_softwarepipe=true;$L") || out2+=("$POPINSTALL,mb-setvar places_softwarepipe=false;$L") diff --git a/usr/bin/jgssh b/usr/bin/jgssh index d30c26b..db350e6 100755 --- a/usr/bin/jgssh +++ b/usr/bin/jgssh @@ -30,7 +30,7 @@ case $LANG in EDIT="Edit" ;; esac - +mkdir -p "$HOME/.ssh" __usage() { grep "^#:" $0 | while read DOC; do printf '%s\n' "${DOC###:}"; done @@ -60,7 +60,30 @@ __removable() { } __standalone() { - echo "TODO" + __mklist +. /usr/bin/pipemenu-standalone.cfg +. $HOME/.config/mabox/mabox.conf +MENU_PADDING_TOP=0 +MENU_HALIGN="left" +MENU_VALIGN="center" +MENU_MARGIN_Y=40 +jgmenu_icon_size=0 +menu_margin_x=${submenu_spacing:-0} +[ $(pidof picom) ] && MENU_RADIUS=$jgtools_radius +[ -z $jgmenu_use_borders ] && menu_border=0 + +mkconfigfile + +cat < ${MENU_ITEMS} + +$(printf '%s\n' "${out[@]}") +$(printf '%s\n' "${out2[@]}") +EOF + +jgmenu --config-file=${CONFIG_FILE} --csv-file=${MENU_ITEMS} 2>/dev/null + +exit 0 + } __ret() { diff --git a/usr/bin/jgtint2-pipe b/usr/bin/jgtint2-pipe index e73c63e..426ae9a 100755 --- a/usr/bin/jgtint2-pipe +++ b/usr/bin/jgtint2-pipe @@ -5,6 +5,8 @@ TINT2PATH="$HOME/.config/tint2" TINT2RC="$TINT2PATH/tint2rc" TZEN="mb-tint2-manager" +me="jgtint2-pipe -s" + case $LANG in pl*) TITLE="Panel Tint2" @@ -85,7 +87,7 @@ if command -v phwmon.py &>/dev/null; then PHWRUN="mabox-obstart phwmon" . $HOME/.config/mabox/mabox.conf -me="mb-jgtools ${jgtools_last}" + out+=("^sep($TRAY_HWMON)") if [ "$(pgrep -f phwmon.py)" ];then out+=("Stop/Disable,mb-setvar phwmon_monitor=false;$PHWRUN;$me") @@ -102,7 +104,31 @@ me="mb-jgtools ${jgtools_last}" # out+=("^sep()") fi +if [ $1 == "-s" ]; then +. /usr/bin/pipemenu-standalone.cfg +. $HOME/.config/mabox/mabox.conf +MENU_PADDING_TOP=0 +MENU_HALIGN="left" +MENU_VALIGN="center" +MENU_MARGIN_Y=40 +jgmenu_icon_size=0 +menu_margin_x=${submenu_spacing:-0} +[ $(pidof picom) ] && MENU_RADIUS=$jgtools_radius +[ -z $jgmenu_use_borders ] && menu_border=0 +mkconfigfile + +cat < ${MENU_ITEMS} + +$(printf '%s\n' "${out[@]}") +$(printf '%s\n' "${out2[@]}") +EOF + +jgmenu --config-file=${CONFIG_FILE} --csv-file=${MENU_ITEMS} 2>/dev/null + +exit 0 + +fi printf '%s\n' "${out[@]}"