From 1315f92aa49a58cfdf846ba787bb85a5fc32a6a0 Mon Sep 17 00:00:00 2001
From: Daniel Napora <napcok@gmail.com>
Date: Wed, 9 Nov 2022 22:56:06 +0100
Subject: [PATCH] mcc fixes with recent terminator

---
 bin/about-mabox     |  4 +++-
 bin/mabox-langfiles |  4 +++-
 bin/mcc             | 11 ++++++-----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/bin/about-mabox b/bin/about-mabox
index c5d2092..3f5a5e9 100755
--- a/bin/about-mabox
+++ b/bin/about-mabox
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+OSCODE=$(grep CODENAME /etc/lsb-release |cut -d '=' -f2)
+
 case "$LANG" in
     pl*)
     COMMENT="Lekki, szybki i funkcjonalny Linux z pulpitem na bazie Openbox"
@@ -12,7 +14,7 @@ esac
 yad --title="About Mabox" --window-icon=mbcc \
  --about \
  --pname="Mabox Linux" \
- --pversion="$(lsb_release -rs) <i>$(lsb_release -cs)</i>" \
+ --pversion="$(lsb_release -rs) <i>${OSCODE}</i>" \
  --image=mbcc \
  --comments="${COMMENT}" \
  --copyright="Copyright 2016-2022, Daniel Napora <danieln@maboxlinux.org>" \
diff --git a/bin/mabox-langfiles b/bin/mabox-langfiles
index 105c552..b1a88f4 100755
--- a/bin/mabox-langfiles
+++ b/bin/mabox-langfiles
@@ -1,5 +1,5 @@
 #!/bin/bash
-#
+# Firstboot script
 # Copy i18n files to ~ if available
 # Run only once invoked from openbox autostart
 LNG=${LANG:0:2}
@@ -11,6 +11,8 @@ if [ ! -f "$FILE" ]; then
         rsync -a /usr/share/mabox/lang/en/ $HOME/
     fi
     echo "selenized-black" > $HOME/.theme_history
+    # Power manager and tint2 native battery indicator only needed on Laptop/Netbook
+    
 touch $HOME/.config/mabox/.lang
 fi
 
diff --git a/bin/mcc b/bin/mcc
index ba98a77..69dd083 100755
--- a/bin/mcc
+++ b/bin/mcc
@@ -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}')
 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
 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=" ARandr!system-terminal!:FBTN" "arandr" \
 --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=" $CLI_UPD (<small><tt>yay</tt></small>)!utilities-terminal!:FBTN" "terminator -x bash -c 'theme.sh red-alert;yay;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=" :LBL" "" \
 --field=" LXRandr!system-terminal!:FBTN" "lxrandr" \
 > $res1 &
@@ -517,8 +518,8 @@ yad --plug=$KEY --tabnum=10 --borders=0 --text="$SYSTEM_DESC" --columns=2 --alig
 --field="LXRandR:FBTN" "lxrandr" \
 --field=" :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=" neofetch!utilities-terminal!:FBTN" "terminator -x bash -c 'neofetch;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=" btop!utilities-terminal!:FBTN" "terminator -T 'btop' -x $BTOP" \
 > $res7 &
 # HELP