From da26aab9e24ddf01ca1d21d65da3b8b95d97173c Mon Sep 17 00:00:00 2001 From: Daniel Napora Date: Fri, 16 Dec 2022 22:33:26 +0100 Subject: [PATCH] upd --- bin/mb-jgtools | 38 +++++++++++++++++++------------------- bin/mb-reset | 13 +++++++++++-- 2 files changed, 30 insertions(+), 21 deletions(-) diff --git a/bin/mb-jgtools b/bin/mb-jgtools index 61f698c..608a85f 100755 --- a/bin/mb-jgtools +++ b/bin/mb-jgtools @@ -693,31 +693,31 @@ MENU_PADDING_TOP=$((jgtools_padding + 60)) if [ $places_quicknav == true ];then cat < ${QNAV} ^sep($QUICK_NAV) - $ROOTDIR,^pipe(jgbrowser /),folder - $HOME_DIR,^pipe(jgbrowser),folder-home - $(basename $(xdg-user-dir DOWNLOAD)),^pipe(jgbrowser $(xdg-user-dir DOWNLOAD)),folder-download - $(basename $(xdg-user-dir DOCUMENTS)),^pipe(jgbrowser $(xdg-user-dir DOCUMENTS)),folder-documents - $(basename $(xdg-user-dir MUSIC)),^pipe(jgbrowser $(xdg-user-dir MUSIC)),folder-music - $(basename $(xdg-user-dir PICTURES)),^pipe(jgbrowser $(xdg-user-dir PICTURES)),folder-pictures - $(basename $(xdg-user-dir VIDEOS)),^pipe(jgbrowser $(xdg-user-dir VIDEOS)),folder-video + $ROOTDIR,^pipe(jgbrowser /),folder + $HOME_DIR,^pipe(jgbrowser),folder-home + $(basename $(xdg-user-dir DOWNLOAD)),^pipe(jgbrowser $(xdg-user-dir DOWNLOAD)),folder-download + $(basename $(xdg-user-dir DOCUMENTS)),^pipe(jgbrowser $(xdg-user-dir DOCUMENTS)),folder-documents + $(basename $(xdg-user-dir MUSIC)),^pipe(jgbrowser $(xdg-user-dir MUSIC)),folder-music + $(basename $(xdg-user-dir PICTURES)),^pipe(jgbrowser $(xdg-user-dir PICTURES)),folder-pictures + $(basename $(xdg-user-dir VIDEOS)),^pipe(jgbrowser $(xdg-user-dir VIDEOS)),folder-video EOF else QNAV="" fi # PIPEMENUS -[ $places_menusettingspipe == true ] && menusettingspipe=" $MENUPANELS,^pipe(jgmenusettings-pipe -r)" && pipesep="^sep($PIPEMENUS)" -[ $places_tint2pipe == true ] && tint2pipe=" $TINT2SETTINGS,^pipe(jgtint2-pipe -r)" && pipesep="^sep($PIPEMENUS)" -[ $places_sysinfopipe == true ] && sysinfopipe=" $SYSINFO,^pipe(jgsysinfo-pipe -r)" && pipesep="^sep($PIPEMENUS)" +[ $places_menusettingspipe == true ] && menusettingspipe=" $MENUPANELS,^pipe(jgmenusettings-pipe -r)" && pipesep="^sep($PIPEMENUS)" +[ $places_tint2pipe == true ] && tint2pipe=" $TINT2SETTINGS,^pipe(jgtint2-pipe -r)" && pipesep="^sep($PIPEMENUS)" +[ $places_sysinfopipe == true ] && sysinfopipe=" $SYSINFO,^pipe(jgsysinfo-pipe -r)" && pipesep="^sep($PIPEMENUS)" #[ $places_keyspipe == true ] && keyspipe=" $SHORTCUTS,^pipe(jgkeys-pipe -r)" && pipesep="^sep($PIPEMENUS)" -[ $places_sshpipe == true ] && sshpipe=" $SSH_CONN,^pipe(jgssh -r)" && pipesep="^sep($PIPEMENUS)" -[ $places_softwarepipe == true ] && softwarepipe=" $POPINSTALL,^pipe(jgsoftware-pipe -r)" && pipesep="^sep($PIPEMENUS)" -[[ $places_conkypipe == true || -z ${places_conkypipe} ]] && conkypipe=" $CONKYSETTINGS,^pipe(jgconky-pipe -r)" && pipesep="^sep($PIPEMENUS)" -[[ $places_jgdeskmngr == true || -z ${places_jgdeskmngr} ]] && jgdeskmngr=" $DESKMNGR,^pipe(jgdeskmngr -r)" && pipesep="^sep($PIPEMENUS)" -[[ $places_jgdesktops == true || -z ${places_jgdesktops} ]] && jgdesktops=" $DESKTOPS,^pipe(jgdesktops -r)" && pipesep="^sep($PIPEMENUS)" -[[ $places_jgdeskgrid == true || -z ${places_jgdeskgrid} ]] && jgdeskgrid=" $DESKGRID,^pipe(jgdeskgrid -r)" && pipesep="^sep($PIPEMENUS)" -[[ $places_jgwallpaperchanger == true || -z ${places_jgwallpaperchanger} ]] && jgwallpaperchanger=" $WALLCHANGER,^pipe(jgwallpaperchanger -r)" && pipesep="^sep($PIPEMENUS)" -[[ $places_jglockscreen == true || -z ${places_jglockscreen} ]] && jglockscreen=" $LOCKSCREEN,^pipe(jglockscreen -r)" && pipesep="^sep($PIPEMENUS)" +[ $places_sshpipe == true ] && sshpipe=" $SSH_CONN,^pipe(jgssh -r)" && pipesep="^sep($PIPEMENUS)" +[ $places_softwarepipe == true ] && softwarepipe=" $POPINSTALL,^pipe(jgsoftware-pipe -r)" && pipesep="^sep($PIPEMENUS)" +[[ $places_conkypipe == true || -z ${places_conkypipe} ]] && conkypipe=" $CONKYSETTINGS,^pipe(jgconky-pipe -r)" && pipesep="^sep($PIPEMENUS)" +[[ $places_jgdeskmngr == true || -z ${places_jgdeskmngr} ]] && jgdeskmngr=" $DESKMNGR,^pipe(jgdeskmngr -r)" && pipesep="^sep($PIPEMENUS)" +[[ $places_jgdesktops == true || -z ${places_jgdesktops} ]] && jgdesktops=" $DESKTOPS,^pipe(jgdesktops -r)" && pipesep="^sep($PIPEMENUS)" +[[ $places_jgdeskgrid == true || -z ${places_jgdeskgrid} ]] && jgdeskgrid=" $DESKGRID,^pipe(jgdeskgrid -r)" && pipesep="^sep($PIPEMENUS)" +[[ $places_jgwallpaperchanger == true || -z ${places_jgwallpaperchanger} ]] && jgwallpaperchanger=" $WALLCHANGER,^pipe(jgwallpaperchanger -r)" && pipesep="^sep($PIPEMENUS)" +[[ $places_jglockscreen == true || -z ${places_jglockscreen} ]] && jglockscreen=" $LOCKSCREEN,^pipe(jglockscreen -r)" && pipesep="^sep($PIPEMENUS)" # VBOXES if [[ -x "$(command -v VBoxManage)" ]]; then @@ -763,7 +763,7 @@ cat < ${MENU_ITEMS} $(gtkbookmarks) $pipesep - $MBHELPER,mbhelper -s + $MBHELPER,mbhelper -s $menusettingspipe $jgwallpaperchanger $jglockscreen diff --git a/bin/mb-reset b/bin/mb-reset index ee6247b..107278d 100755 --- a/bin/mb-reset +++ b/bin/mb-reset @@ -1,6 +1,6 @@ #!/bin/bash # Daniel Napora 2021-22 -#: mb-reset - reset/update user config files to current defaults. +#: mb-reset - reset/update user config files to (current) distro defaults. #: It only affects files shipped with Mabox. #: Be aware that you may loose your own customizations (if any). #: @@ -18,6 +18,7 @@ #: bashrc - bash config file (~/.bashrc) #: terminator - terminator config #: conky - overwrite conky config files in ~/.config/conky/ +#: glyphicons - override font settings for glyphicons #: tint2 - overwrite tint2 panel config files in ~/.config/tint2/ #: jgthemes - overwrite menu/sidepanels color schemes in ~/.config/mabox/jgobthemes/ #: mainmenu - overwrite main menu files (favorites.csv) @@ -25,7 +26,7 @@ #: rightpanel - right panel custom commands #: allmenus - overvrite all menus, panels and exit dialog #: logout - logout dialog -#: wrappers - nitrogen and xrandr Mabox wrappers +#: wrappers - nitrogen, xrandr and lxappearance Mabox wrappers @@ -111,6 +112,13 @@ __logout() { rsync -a /usr/share/mabox/lang/$LNGDIR/.config/mabox/exit.csv $HOME/.config/mabox/ } +__glyphicons () { +rm $HOME/.local/share/fonts/lucide.ttf +mkdir -p $HOME/.config/fontconfig/conf.d +rsync -a /usr/share/mabox/common/66-symbols.conf $HOME/.config/fontconfig/conf.d/ +fc-cache +} + __tint2() { rm $HOME/.local/share/fonts/lucide.ttf mkdir -p $HOME/.config/fontconfig/conf.d @@ -177,6 +185,7 @@ case "$1" in "leftpanel") __leftpanel ;; "rightpanel") __rightpanel ;; "logout") __logout ;; + "glyphicons") __glyphicons ;; "tint2") __tint2 ;; "jgthemes") __jgthemes ;; "conky") __conky ;;