Minor changes.

diff --git a/testing/home/t490s/.nonpath_bins/status.sh b/testing/home/t490s/.nonpath_bins/status.sh
index df576c161c87ebab3ee6d692fd5d913654fb69b0..8b532f7defe01a2770429afbf4eb05e72747c1c9 100755 (executable)
--- a/testing/home/t490s/.nonpath_bins/status.sh
+++ b/testing/home/t490s/.nonpath_bins/status.sh
@@ -1,7 +1,10 @@
 #!/bin/sh
 # see sway-bar(5) and swaybar-protocol(7)
 KILO=1000
-WHITE=ffffff
+COL_WHITE=ffffff
+COL_YELLOW=ffff00
+COL_GREEN=00ff00
+COL_GREY=aaaaaa
 
 BAT_DIR=/sys/class/power_supply/BAT0
 
@@ -10,21 +13,21 @@ print_bar_element() {
 }
 
 print_online() {
-    print_bar_element "$(ip -4 addr show scope global | grep -oP '(?<=inet\s)\d+(\.\d+){3}')" 20 "${WHITE}"
+    print_bar_element "$(ip -4 addr show scope global | grep -oP '(?<=inet\s)\d+(\.\d+){3}')" 20 "${COL_WHITE}"
 }
 
 print_battery() {
-    COLOR="${WHITE}"
+    COLOR="${COL_WHITE}"
     STATUS=$(cat "${BAT_DIR}/status")
     CHARGING=?
     if [ "${STATUS}" = "Not charging" ]; then
         CHARGING=_
     elif [ "${STATUS}" = "Charging" ]; then
         CHARGING=^
-       COLOR=00ff00
+       COLOR="${COL_GREEN}"
     elif [ "${STATUS}" = "Discharging" ]; then
         CHARGING=v
-       COLOR=ffff00
+       COLOR="${COL_YELLOW}"
     fi
     NOW=$(printf "%d" $(calc "100 * $(cat ${BAT_DIR}/energy_now) // $(cat ${BAT_DIR}/energy_full)"))
     MAX=$(printf "%d" $(calc "100 * $(cat ${BAT_DIR}/energy_full) // $(cat ${BAT_DIR}/energy_full_design)"))
@@ -32,12 +35,12 @@ print_battery() {
 }
 
 print_temperature() {
-    print_bar_element $(calc "$(cat /sys/class/thermal/thermal_zone0/temp) // ${KILO}")'°C' 20 "${WHITE}"
+    print_bar_element $(calc "$(cat /sys/class/thermal/thermal_zone0/temp) // ${KILO}")'°C' 20 "${COL_WHITE}"
 }
 
 print_datetime() {
-    print_bar_element "$(date +'%Y-%m-%d')" 10 "aaaaaa"
-    print_bar_element "$(date +'%H:%M:%S/%Z')" 0 "${WHITE}"
+    print_bar_element "$(date +'%Y-%m-%d')" 10 "${COL_GREY}"
+    print_bar_element "$(date +'%H:%M:%S/%Z')" 0 "${COL_WHITE}"
 }
 
 printf '{"version": 1}\n[' 

diff --git a/testing/scripts/setup_secrets_user.sh b/testing/scripts/setup_secrets_user.sh
index 0d5be2ae0a4537a4839eeacde16459e0034dc45e..4ef27285d4ffdec7896e151d512c4d00ee673ec2 100755 (executable)
--- a/testing/scripts/setup_secrets_user.sh
+++ b/testing/scripts/setup_secrets_user.sh
@@ -17,7 +17,7 @@ abort_if_exists "${PATH_USER_SSH}"
 abort_if_exists "${PATH_REPOS}"
 abort_if_exists "${PATH_BORGKEYS}"
 
-echo "Setting up ~/.ssh"
+echo "\nSetting up ~/.ssh"
 PATH_PRIVATE_KEY="${PATH_USER_SSH}/${FILENAME_PRIVATE_KEY}"
 PATH_PUBLIC_KEY="${PATH_USER_SSH}/${FILENAME_PUBLIC_KEY}"
 mkdir -p "${PATH_USER_SSH}"
@@ -31,7 +31,7 @@ while [ ! -s "${PATH_PUBLIC_KEY}" ]; do
 done
 PATH_KNOWN_HOSTS="${PATH_USER_SSH}/known_hosts"
 
-echo "Setting up ~/repos"
+echo "\n\nSetting up ~/repos"
 REPOS_SITE_LOGIN="${USERNAME}@${REPOS_SITE_DOMAIN}"
 eval $(ssh-agent) && ssh-add
 ssh-keyscan "${REPOS_SITE_DOMAIN}" >> "${PATH_KNOWN_HOSTS}"
@@ -41,7 +41,7 @@ ssh ${REPOS_SITE_LOGIN} "cd $REMOTE_PATH_REPOS && ls -1" | while read REPO_NAME;
     git clone --recurse "${REPOS_SITE_LOGIN}:${REMOTE_PATH_REPOS}/${REPO_NAME}"
 done
 
-echo "Set up borg and pull in ~/org"
+echo "\nSet up borg and pull in ~/org"
 PATH_TARED_KEYS=borg_keyfiles
 mkdir -p "${PATH_BORGKEYS}"
 tar xf "${PATH_SECRETS}/${PATH_TARED_KEYS}.tar"
@@ -68,4 +68,4 @@ done
 
 PATH_REL_DEL_REPO="DELETE_${PATH_REL_REPO}"
 mv "${HOME}/${PATH_REL_REPO}" "${HOME}/${PATH_REL_DEL_REPO}"
-echo "With ~/repos set up, new reference be ~/repos/${PATH_REL_REPO}; moved ~/${PATH_REL_REPO} to ~/${PATH_REL_DEL_REPO}, ready to be deleted by you."
+echo "\nWith ~/repos set up, new reference be ~/repos/${PATH_REL_REPO}; moved ~/${PATH_REL_REPO} to ~/${PATH_REL_DEL_REPO}, ready to be deleted by you."