From 3fd833967599a14a7eb114db03ae736a8ee90a92 Mon Sep 17 00:00:00 2001 From: Daniel Napora Date: Wed, 17 Aug 2022 14:19:31 +0200 Subject: [PATCH] geany -> xdg-open --- usr/bin/jgconky-pipe | 2 +- usr/bin/jgdeskgrid | 4 ++-- usr/bin/jgdeskmngr | 2 +- usr/bin/jgespanso-pipe | 2 +- usr/bin/jglockscreen | 2 +- usr/bin/jgmenusettings-pipe | 18 +++++++++--------- usr/bin/jgpicom-pipe | 2 +- usr/bin/jgssh | 2 +- usr/bin/jgtint2-pipe | 2 +- usr/bin/jgwallpaperchanger | 6 +++--- usr/bin/mabox-compositor | 4 ++-- usr/bin/mabox-conky-pipemenu | 3 +-- usr/bin/mabox-kb-pipemenu | 2 +- usr/bin/mabox-tint2-pipemenu | 4 ++-- usr/bin/mbhelper | 4 ++-- 15 files changed, 29 insertions(+), 30 deletions(-) diff --git a/usr/bin/jgconky-pipe b/usr/bin/jgconky-pipe index 9af22fe..debfdad 100755 --- a/usr/bin/jgconky-pipe +++ b/usr/bin/jgconky-pipe @@ -78,7 +78,7 @@ EditMenu(){ CPATH=$(echo "$session" | awk '{print $3}') #CONKY=$(echo "$CPATH" | awk -F"/" '{print $(NF-1)"/"$NF }') CONKY=${CPATH##*/} - out2+=("$CONKY,geany $CPATH") + out2+=("$CONKY,xdg-open $CPATH") done < "$CSESSIONFILE" else diff --git a/usr/bin/jgdeskgrid b/usr/bin/jgdeskgrid index 6081923..ece85e6 100755 --- a/usr/bin/jgdeskgrid +++ b/usr/bin/jgdeskgrid @@ -80,7 +80,7 @@ ROWS=${rows:-12} me="jgdeskgrid -s" out+=("^sep(DesktopGrid)") -out+=("$ABOUT,notify-send.sh -u critical -i mbcc '$title' '$help' -o '$SHOW_IMGHELPER:drawgrid' -o '$EDITCONF:geany ~/.config/deskgrid/deskgrid.cfg'") +out+=("$ABOUT,notify-send.sh -u critical -i mbcc '$title' '$help' -o '$SHOW_IMGHELPER:drawgrid' -o '$EDITCONF:xdg-open ~/.config/deskgrid/deskgrid.cfg'") out+=("$SHOW_IMGHELPER,drawgrid") out+=("$QUICK_TILE,yhtml /usr/share/mabox/help/Quick_tiling.html 'Mabox Quick tiling trainer - Ctrl + Shift + click'") out+=("^sep($CONFIGURATION)") @@ -90,7 +90,7 @@ out+=("$LGAP [ $GAP ],^checkout(gap)") out+=("$OUTER_GAP [ $show_outer_gap ],^checkout(outer)") out+=("$NOTIFY [ $notifications ],^checkout(notify)") out+=("^sep()") -out+=("$EDITCONF,geany $CONFIG_FILE") +out+=("$EDITCONF,xdg-open $CONFIG_FILE") #out2+=("^tag(columns)") #for i in 8 12 16 24 32; do out2+=("$(printf "%3s,%s" "$i" "mb-setvar columns=${i} $CONFIG_FILE;$me")");done diff --git a/usr/bin/jgdeskmngr b/usr/bin/jgdeskmngr index 8b19f65..3ee9a7d 100755 --- a/usr/bin/jgdeskmngr +++ b/usr/bin/jgdeskmngr @@ -94,7 +94,7 @@ out2+=("^sep($RESTORE_TO)") out2+=("\"\"\" ${dname/&/&}\"\"\",deskmngr -r $name.desk $ID") done < <(wmctrl -d|awk '{print $1}') out2+=("^sep()" "  $OVERWRITE ${name//_/ },deskmngr save $name") -out2+=("^sep()" "  $EDIT ${name//_/ },geany $SESSIONDIR$name.desk") +out2+=("^sep()" "  $EDIT ${name//_/ },xdg-open $SESSIONDIR$name.desk") out2+=("^sep()" "  $DELETE ${name//_/ },rm -f $SESSIONDIR$name.desk;$me") ((i=i+1)) done < <(deskmngr -l) diff --git a/usr/bin/jgespanso-pipe b/usr/bin/jgespanso-pipe index c90f40d..074c7dc 100755 --- a/usr/bin/jgespanso-pipe +++ b/usr/bin/jgespanso-pipe @@ -41,7 +41,7 @@ else echo "@search,,10,5,292,20,4,left,top,auto,#262626,\"\"\" $TYPE_TO_SEARCH\"\"\"" >/tmp/espanso_list.csv echo "^sep(Espanso - text expander)" >>/tmp/espanso_list.csv echo "^sep($CONFIGURE)" >>/tmp/espanso_list.csv -echo "$EDITCONF, geany ~/.config/espanso/default.yml" >>/tmp/espanso_list.csv +echo "$EDITCONF, xdg-open ~/.config/espanso/default.yml" >>/tmp/espanso_list.csv echo "$OPENCONFDIR,pcmanfm ~/.config/espanso/user/" >>/tmp/espanso_list.csv echo "$DOCU,exo-open --launch WebBrowser https://espanso.org/docs/" >>/tmp/espanso_list.csv echo "^sep($LIST)" >>/tmp/espanso_list.csv diff --git a/usr/bin/jglockscreen b/usr/bin/jglockscreen index 31928d8..6a2ca71 100755 --- a/usr/bin/jglockscreen +++ b/usr/bin/jglockscreen @@ -94,7 +94,7 @@ else out+=("$DESK,mb-setvar screenlocker=i3lock $SCRNLOCKCFG;mbscreenlocker") fi out+=("^sep()") -out+=("$EDITCONF ,geany $SCRNLOCKCFG") +out+=("$EDITCONF ,xdg-open $SCRNLOCKCFG") out2+=("^tag(interval)") for i in 3 5 10 30 60 120 300 600 1800 3600; do out2+=("$(printf " %4s,%s" "$i" "mb-setvar interval=${i} $CONFIG_FILE;$me")");done diff --git a/usr/bin/jgmenusettings-pipe b/usr/bin/jgmenusettings-pipe index 95f9486..ba7eac8 100755 --- a/usr/bin/jgmenusettings-pipe +++ b/usr/bin/jgmenusettings-pipe @@ -232,8 +232,8 @@ out+=("$EXITMENU,^checkout(exit_edit)") out2+=("^tag(mainmenu_edit)") out2+=("^sep($MAINMENU)") -out2+=("$EDIT $FAVORITES, geany $HOME/.config/mabox/favorites.csv, geany") -out2+=("$EDIT $BELOW_APPS, geany $HOME/.config/mabox/mainmenu_below_apps.csv, geany") +out2+=("$EDIT $FAVORITES, xdg-open $HOME/.config/mabox/favorites.csv, geany") +out2+=("$EDIT $BELOW_APPS, xdg-open $HOME/.config/mabox/mainmenu_below_apps.csv, geany") out2+=("^sep($APPS_POS)") out2+=("$APPS_MAIN,mb-setvar apps_in_submenu=false;mb-jgtools main ipc") out2+=("$APPS_SUB,mb-setvar apps_in_submenu=true;mb-jgtools main ipc") @@ -241,7 +241,7 @@ out2+=("^sep(Reset)") out2+=("$RESET,mb-reset mainmenu") out2+=("^tag(left_edit)") out2+=("^sep($LEFTPANEL)") -out2+=("$EDIT $OWN_COMMANDS ($TOP), geany $HOME/.config/mabox/places-prepend.csv, geany") +out2+=("$EDIT $OWN_COMMANDS ($TOP), xdg-open $HOME/.config/mabox/places-prepend.csv, geany") #out2+=("^sep()") out2+=("^sep($MODULES)") @@ -268,20 +268,20 @@ out2+=("^sep($PIPEMENUS)") [[ $places_conkypipe = false ]] && out2+=("$CONKY,mb-setvar places_conkypipe=true;$L") || out2+=("$CONKY,mb-setvar places_conkypipe=false;$L") out2+=("^sep()") -out2+=("$EDIT $OWN_COMMANDS ($BOTTOM), geany $HOME/.config/mabox/places-append.csv, geany") +out2+=("$EDIT $OWN_COMMANDS ($BOTTOM), xdg-open $HOME/.config/mabox/places-append.csv, geany") out2+=("^sep(Reset)") out2+=("$RESET,mb-reset leftpanel") out2+=("^tag(right_edit)") out2+=("^sep($RIGHTPANEL)") -out2+=("$EDIT $OWN_COMMANDS ($TOP), geany $HOME/.config/mabox/right-prepend.csv, geany") -out2+=("$EDIT $OWN_COMMANDS ($BOTTOM), geany $HOME/.config/mabox/right-append.csv, geany") +out2+=("$EDIT $OWN_COMMANDS ($TOP), xdg-open $HOME/.config/mabox/right-prepend.csv, geany") +out2+=("$EDIT $OWN_COMMANDS ($BOTTOM), xdg-open $HOME/.config/mabox/right-append.csv, geany") out2+=("^sep(Reset)") out2+=("$RESET,mb-reset rightpanel") out2+=("^tag(exit_edit)") out2+=("^sep($EXITMENU)") -out2+=("$EDIT $EXITMENU, geany $HOME/.config/mabox/exit.csv, geany") +out2+=("$EDIT $EXITMENU, xdg-open $HOME/.config/mabox/exit.csv, geany") out2+=("^sep(Reset)") out2+=("$RESET,mb-reset logout") @@ -382,7 +382,7 @@ ob_file=$HOME/.config/openbox/rc.xml if [ $jgmenu_theme != obtheme ]; then #INNY NIŻ OB THEME . $HOME/.config/mabox/jgobthemes/${jgmenu_theme}.colorrc > /dev/null 2>&1 & out+=("$CHOOSE [$jgmenu_theme],^checkout(motywy)") -out+=("$EDIT_CURRENT: ($jgmenu_theme),geany $HOME/.config/mabox/jgobthemes/$jgmenu_theme.colorrc,geany") +out+=("$EDIT_CURRENT: ($jgmenu_theme),xdg-open $HOME/.config/mabox/jgobthemes/$jgmenu_theme.colorrc,geany") out+=("$RANDTHEME,mb-setvar jgmenu_theme=$(basename -s .colorrc $(ls ~/.config/mabox/jgobthemes/*.colorrc | shuf -n 1));$me") out+=("$FOLLOW_OB,mb-setvar jgmenu_theme=obtheme;$me ^sep()") @@ -395,7 +395,7 @@ else . $HOME/.config/mabox/jgobthemes/${wm_theme// /_}.colorrc > /dev/null 2>&1 & #out+=("#${menu_gradient_pos}\n") out+=("$CHOOSE [${wm_theme// /_}],^checkout(motywy)") -out+=("$EDIT_CURRENT: (${wm_theme// /_}),geany $HOME/.config/mabox/jgobthemes/${wm_theme// /_}.colorrc,geany") +out+=("$EDIT_CURRENT: (${wm_theme// /_}),xdg-open $HOME/.config/mabox/jgobthemes/${wm_theme// /_}.colorrc,geany") out+=("$RANDTHEME,mb-setvar jgmenu_theme=$(basename -s .colorrc $(ls ~/.config/mabox/jgobthemes/*.colorrc | shuf -n 1));$me") out+=("$FOLLOW_OB,mb-setvar jgmenu_theme=obtheme;$me ^sep()") diff --git a/usr/bin/jgpicom-pipe b/usr/bin/jgpicom-pipe index 2fe4fb0..3350ad9 100755 --- a/usr/bin/jgpicom-pipe +++ b/usr/bin/jgpicom-pipe @@ -80,7 +80,7 @@ done out+=("^sep($EDIT_TITLE)") if [ -f "$CONFFFILE" ];then if [ ! "$(readlink $CONFFILE)" -ef "/dev/null" ];then -out+=("$EDIT,geany $CONFFILE") +out+=("$EDIT,xdg-open $CONFFILE") fi fi out+=("$OPENDIR,exo-open --launch FileManager $CONFDIR") diff --git a/usr/bin/jgssh b/usr/bin/jgssh index 79844db..ea5cf16 100755 --- a/usr/bin/jgssh +++ b/usr/bin/jgssh @@ -49,7 +49,7 @@ out2+=(" $TERM,^term(ssh $host)") out2+=(" $FM,pcmanfm $HOME sftp://$host/") done out+=("^sep()") -out+=("$EDIT ~/.ssh/config, geany $HOME/.ssh/config") +out+=("$EDIT ~/.ssh/config, xdg-open $HOME/.ssh/config") } __removable() { diff --git a/usr/bin/jgtint2-pipe b/usr/bin/jgtint2-pipe index c813fa1..c04fd3e 100755 --- a/usr/bin/jgtint2-pipe +++ b/usr/bin/jgtint2-pipe @@ -298,7 +298,7 @@ out+=("^sep($TINT2_CONFIGURE)") getvalues qactions out+=("$CONFIGURE $TINT2,tint2conf $TINT") - out+=("$EDIT_TINT2 $TINT2,geany $TINT") + out+=("$EDIT_TINT2 $TINT2,xdg-open $TINT") fi diff --git a/usr/bin/jgwallpaperchanger b/usr/bin/jgwallpaperchanger index 72622a0..a8c463d 100755 --- a/usr/bin/jgwallpaperchanger +++ b/usr/bin/jgwallpaperchanger @@ -85,13 +85,13 @@ out+=("^sep($SLIDESHOW)") out+=("$STOPS,killall mbwallpaper;$me") fi -#out+=("About Wallpaper changer,\"\"\"notify-send.sh -u critical -i mbcc 'Wallpaper Changer - rotate desktop wallpaper every n-seconds' '$help' -o 'Edit configuration file:geany ~/.config/mbwallpaper/mbwallpaper.conf'\"\"\"") +#out+=("About Wallpaper changer,\"\"\"notify-send.sh -u critical -i mbcc 'Wallpaper Changer - rotate desktop wallpaper every n-seconds' '$help' -o 'Edit configuration file:xdg-open ~/.config/mbwallpaper/mbwallpaper.conf'\"\"\"") out+=("^sep()") -out+=("$WALLDIR: [ $wallpaper_dir ],geany $CONFIG_FILE") +out+=("$WALLDIR: [ $wallpaper_dir ],xdg-open $CONFIG_FILE") out+=("$INTERVAL [ $interval ] ($SEC),^checkout(interval)") out+=("^sep()") -out+=("$EDITCONF ,geany $CONFIG_FILE") +out+=("$EDITCONF ,xdg-open $CONFIG_FILE") out+=("$OPENDIR,pcmanfm -n $wallpaper_dir") out2+=("^tag(interval)") diff --git a/usr/bin/mabox-compositor b/usr/bin/mabox-compositor index 4c3003d..9c8be5f 100755 --- a/usr/bin/mabox-compositor +++ b/usr/bin/mabox-compositor @@ -50,8 +50,8 @@ if [[ $1 = '--edit' ]]; then [[ ! -f $HOME/.config/picom.conf ]] && cp '/etc/xdg/picom.conf' "$HOME/.config/picom.conf" - if [[ -x /usr/bin/geany ]]; then - geany "$HOME/.config/picom.conf" & + if [[ -x /usr/bin/xdg-open ]]; then + xdg-open "$HOME/.config/picom.conf" & else terminator --command='nano "$HOME/.config/picom.conf"' fi diff --git a/usr/bin/mabox-conky-pipemenu b/usr/bin/mabox-conky-pipemenu index fbd92c1..f368775 100755 --- a/usr/bin/mabox-conky-pipemenu +++ b/usr/bin/mabox-conky-pipemenu @@ -126,7 +126,6 @@ loadPinMenu(){ } loadEditMenu(){ - #menuItem "$DEFAULT_CONKYRC" "geany $CONKYDEFAULT" if [[ $(pidof conky) ]];then menuSubmenu "RunningConky" "$RUNNING_CONKY" menuSeparator "$RUNNING_CONKY" @@ -134,7 +133,7 @@ loadEditMenu(){ [[ -z $session ]] && continue CPATH=$(echo "$session" | awk '{print $3}') CONKY=$(echo "$CPATH" | awk -F"/" '{print $(NF-1)"/"$NF }') - menuItem "$CONKY" "geany $CPATH" + menuItem "$CONKY" "xdg-open $CPATH" done < "$CSESSIONFILE" menuSubmenuEnd else diff --git a/usr/bin/mabox-kb-pipemenu b/usr/bin/mabox-kb-pipemenu index 371ffeb..60c4c78 100755 --- a/usr/bin/mabox-kb-pipemenu +++ b/usr/bin/mabox-kb-pipemenu @@ -71,7 +71,7 @@ if [[ $1 = '--rcedit' ]];then # "Backup & Edit rc.xml" is chosen in menu NOW=$(date +"%Y%m%d-%H%M") RCBKP="$RCPATH.$NOW" cp "$RCPATH" "$RCBKP" - geany "$RCPATH" # open rc.xml in default editor + xdg-open "$RCPATH" # open rc.xml in default editor fi diff --git a/usr/bin/mabox-tint2-pipemenu b/usr/bin/mabox-tint2-pipemenu index 89f17e6..dc1c840 100755 --- a/usr/bin/mabox-tint2-pipemenu +++ b/usr/bin/mabox-tint2-pipemenu @@ -60,7 +60,7 @@ esac loadTEditmenu(){ menuSeparator - menuItem "$DEFAULT_TINT2RC" "geany $TINT2RC" + menuItem "$DEFAULT_TINT2RC" "xdg-open $TINT2RC" if [ "$(pidof tint2)" ];then menuSubmenu "RunningTint2" "$RUNNING_TINT2" menuSeparator "$RUNNING_TINT2" @@ -72,7 +72,7 @@ loadTEditmenu(){ TINT="$TINT2RC" TINT2="$DEFAULT_TINT2RC" fi - menuItem "$TINT2" "geany $TINT" + menuItem "$TINT2" "xdg-open $TINT" fi done menuSubmenuEnd diff --git a/usr/bin/mbhelper b/usr/bin/mbhelper index cadda91..29759ab 100755 --- a/usr/bin/mbhelper +++ b/usr/bin/mbhelper @@ -80,10 +80,10 @@ fi edit() { if [[ -f "$HOME/.config/mabox/mbhelper.csv" ]];then -geany "$HOME/.config/mabox/mbhelper.csv" +xdg-open "$HOME/.config/mabox/mbhelper.csv" else cp "/usr/share/mabox/lang/${LNGDIR}/.config/mabox/mbhelper.csv" "$HOME/.config/mabox/mbhelper.csv" -geany "$HOME/.config/mabox/mbhelper.csv" +xdg-open "$HOME/.config/mabox/mbhelper.csv" fi }