From 7acfbbd87add9300dee135e0ec71f66652009794 Mon Sep 17 00:00:00 2001 From: Davius <66792063+Xdavius@users.noreply.github.com> Date: Fri, 8 Mar 2024 16:31:28 +0100 Subject: [PATCH 1/3] Update vars.sh --- scripts/vars.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/scripts/vars.sh b/scripts/vars.sh index c8ba8bf..abb1aec 100644 --- a/scripts/vars.sh +++ b/scripts/vars.sh @@ -9,10 +9,20 @@ function ProgressBar { printf "[${_fill// /▇}${_empty// / }] ${_progress}%% Done" } +os=$(grep ^ID= /etc/os-release | cut -d "=" -f 2 | tr -d \") + +case $os in +silverblue|kinoite) +homedir=/var/home/$LOGNAME +;; +*) +homedir=/home/$LOGNAME +;; +esac bar_length=2 #Number between 1 and 10 today=$(date +%s) -install_date=$(stat -c %W /) +install_date=$(stat -c %W $homedir) install_date_day=$(stat -c %W / | awk '{print strftime("%e/%m/%Y",$1)}' | awk '{$1=$1};1') install_time=$(( ($today - $install_date) / 86400 )) end_challenge=30 From ceb8700b6243dbe4e299ca3c6b7afb994722b1b2 Mon Sep 17 00:00:00 2001 From: Davius <66792063+Xdavius@users.noreply.github.com> Date: Fri, 8 Mar 2024 16:44:39 +0100 Subject: [PATCH 2/3] Update vars.sh --- scripts/vars.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/vars.sh b/scripts/vars.sh index abb1aec..53c35eb 100644 --- a/scripts/vars.sh +++ b/scripts/vars.sh @@ -13,17 +13,17 @@ os=$(grep ^ID= /etc/os-release | cut -d "=" -f 2 | tr -d \") case $os in silverblue|kinoite) -homedir=/var/home/$LOGNAME +homedir=/var/home ;; *) -homedir=/home/$LOGNAME +homedir=/home ;; esac bar_length=2 #Number between 1 and 10 today=$(date +%s) install_date=$(stat -c %W $homedir) -install_date_day=$(stat -c %W / | awk '{print strftime("%e/%m/%Y",$1)}' | awk '{$1=$1};1') +install_date_day=$(stat -c %W $homedir | awk '{print strftime("%e/%m/%Y",$1)}' | awk '{$1=$1};1') install_time=$(( ($today - $install_date) / 86400 )) end_challenge=30 percentage=$(( $install_time / $end_challenge * 100 )) From ff164a3ce88b72938204c130c2410ecfee2444e0 Mon Sep 17 00:00:00 2001 From: Davius <66792063+Xdavius@users.noreply.github.com> Date: Fri, 8 Mar 2024 20:06:50 +0100 Subject: [PATCH 3/3] Update vars.sh --- scripts/vars.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/vars.sh b/scripts/vars.sh index 53c35eb..52a6a21 100644 --- a/scripts/vars.sh +++ b/scripts/vars.sh @@ -16,7 +16,7 @@ silverblue|kinoite) homedir=/var/home ;; *) -homedir=/home +homedir=/ ;; esac