Mabox
/
mabox-tools
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mcc fixes with recent terminator

master
Daniel Napora 2022-11-09 22:56:06 +01:00
parent b7973a23d2
commit 1315f92aa4
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/about-mabox
View File

@ -1,5 +1,7 @@
#!/bin/bash #!/bin/bash
OSCODE=$(grep CODENAME /etc/lsb-release |cut -d '=' -f2)
case "$LANG" in case "$LANG" in
pl*) pl*)
COMMENT="Lekki, szybki i funkcjonalny Linux z pulpitem na bazie Openbox" COMMENT="Lekki, szybki i funkcjonalny Linux z pulpitem na bazie Openbox"
@ -12,7 +14,7 @@ esac
yad --title="About Mabox" --window-icon=mbcc \ yad --title="About Mabox" --window-icon=mbcc \
--about \ --about \
--pname="Mabox Linux" \ --pname="Mabox Linux" \
--pversion="$(lsb_release -rs) <i>$(lsb_release -cs)</i>" \ --pversion="$(lsb_release -rs) <i>${OSCODE}</i>" \
--image=mbcc \ --image=mbcc \
--comments="${COMMENT}" \ --comments="${COMMENT}" \
--copyright="Copyright 2016-2022, Daniel Napora <danieln@maboxlinux.org>" \ --copyright="Copyright 2016-2022, Daniel Napora <danieln@maboxlinux.org>" \

4
bin/mabox-langfiles
View File

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
# # Firstboot script
# Copy i18n files to ~ if available # Copy i18n files to ~ if available
# Run only once invoked from openbox autostart # Run only once invoked from openbox autostart
LNG=${LANG:0:2} LNG=${LANG:0:2}
@ -11,6 +11,8 @@ if [ ! -f "$FILE" ]; then
rsync -a /usr/share/mabox/lang/en/ $HOME/ rsync -a /usr/share/mabox/lang/en/ $HOME/
fi fi
echo "selenized-black" > $HOME/.theme_history echo "selenized-black" > $HOME/.theme_history
# Power manager and tint2 native battery indicator only needed on Laptop/Netbook
touch $HOME/.config/mabox/.lang touch $HOME/.config/mabox/.lang
fi fi

11
bin/mcc
View File

@ -306,7 +306,8 @@ trap "rm -f $res1 $res3 $res4 $res5 $res6 $res7 $res8 $res9 $res10 $res11 $res12
OSNAME=$(lsb_release -d | awk '{print $2}') OSNAME=$(lsb_release -d | awk '{print $2}')
OSVERSION=$(lsb_release -r | awk '{print $2}') OSVERSION=$(lsb_release -r | awk '{print $2}')
OSCODE=$(lsb_release -c | awk '{print $2}') #OSCODE=$(lsb_release -c | awk '{print $2}')
OSCODE=$(grep CODENAME /etc/lsb-release |cut -d '=' -f2)
# system uptime # system uptime
UPT="$(uptime -p)" UPT="$(uptime -p)"
@ -369,8 +370,8 @@ yad --plug=$KEY --tabnum=1 --borders=10 \
--field=" $KERNELS!distributor-logo-linux!:FBTN" "manjaro-settings-manager -m msm_kernel" \ --field=" $KERNELS!distributor-logo-linux!:FBTN" "manjaro-settings-manager -m msm_kernel" \
--field=" ARandr!system-terminal!:FBTN" "arandr" \ --field=" ARandr!system-terminal!:FBTN" "arandr" \
--field=" :LBL" "" \ --field=" :LBL" "" \
--field=" $PKGS_STAT (<small><tt>yay -Ps</tt></small>)!utilities-terminal!:FBTN" "terminator -T 'Package stats' -x bash -c 'yay -Ps;read'" \ --field=" $PKGS_STAT (<small><tt>yay -Ps</tt></small>)!utilities-terminal!:FBTN" "terminator -T 'Package stats' -x 'bash -c yay -Ps;read'" \
--field=" $CLI_UPD (<small><tt>yay</tt></small>)!utilities-terminal!:FBTN" "terminator -x bash -c 'theme.sh red-alert;yay;read'" \ --field=" $CLI_UPD (<small><tt>yay</tt></small>)!utilities-terminal!:FBTN" "terminator -x 'bash -c theme.sh red-alert;yay;read'" \
--field=" :LBL" "" \ --field=" :LBL" "" \
--field=" LXRandr!system-terminal!:FBTN" "lxrandr" \ --field=" LXRandr!system-terminal!:FBTN" "lxrandr" \
> $res1 & > $res1 &
@ -517,8 +518,8 @@ yad --plug=$KEY --tabnum=10 --borders=0 --text="$SYSTEM_DESC" --columns=2 --alig
--field="LXRandR:FBTN" "lxrandr" \ --field="LXRandR:FBTN" "lxrandr" \
--field=" :LBL" "" \ --field=" :LBL" "" \
--field="<b>Info</b>:LBL" "" \ --field="<b>Info</b>:LBL" "" \
--field=" inxi -CGAD!utilities-terminal!:FBTN" "terminator -T 'inxi -CAGD system info' -x bash -c 'inxi -CGAD;bash'" \ --field=" inxi -CGAD!utilities-terminal!:FBTN" "terminator -T 'inxi -CAGD system info' -x 'bash -c inxi -CGAD;bash'" \
--field=" neofetch!utilities-terminal!:FBTN" "terminator -x bash -c 'neofetch;bash'" \ --field=" neofetch!utilities-terminal!:FBTN" "terminator -x 'bash -c neofetch;bash'" \
--field=" btop!utilities-terminal!:FBTN" "terminator -T 'btop' -x $BTOP" \ --field=" btop!utilities-terminal!:FBTN" "terminator -T 'btop' -x $BTOP" \
> $res7 & > $res7 &
# HELP # HELP