jeka/kiauh
1
0
Fork 0
mirror of https://github.com/dw-0/kiauh.git synced 2025-12-14 02:54:28 +05:00
Code Issues Packages Projects Releases Wiki Activity

fix: fix some UI stuff

Browse Source
This commit is contained in:
domi
2020-11-28 17:42:36 +01:00
parent c61e101627
commit 10558103a5
3 changed files with 48 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
scripts/status.sh
View File

@@ -156,7 +156,7 @@ octoprint_status(){
} }
klipperscreen_status(){ klipperscreen_status(){
mrcount=0 klsccount=0
klipperscreen_data=( klipperscreen_data=(
SERVICE SERVICE
$KLIPPERSCREEN_DIR $KLIPPERSCREEN_DIR
@@ -165,15 +165,15 @@ klipperscreen_status(){
#remove the "SERVICE" entry from the klipperscreen_data array if a klipperscreen service is installed #remove the "SERVICE" entry from the klipperscreen_data array if a klipperscreen service is installed
[ "$(systemctl list-units --full -all -t service --no-legend | grep -F "KlipperScreen.service")" ] && unset klipperscreen_data[0] [ "$(systemctl list-units --full -all -t service --no-legend | grep -F "KlipperScreen.service")" ] && unset klipperscreen_data[0]
#count+1 for each found data-item from array #count+1 for each found data-item from array
for mrd in "${klipperscreen_data[@]}" for klscd in "${klipperscreen_data[@]}"
do do
if [ -e $mrd ]; then if [ -e $klscd ]; then
mrcount=$(expr $mrcount + 1) klsccount=$(expr $klsccount + 1)
fi fi
done done
if [ "$mrcount" == "${#klipperscreen_data[*]}" ]; then if [ "$klsccount" == "${#klipperscreen_data[*]}" ]; then
KLIPPERSCREEN_STATUS="${green}Installed!${default} " KLIPPERSCREEN_STATUS="${green}Installed!${default} "
elif [ "$mrcount" == 0 ]; then elif [ "$klsccount" == 0 ]; then
KLIPPERSCREEN_STATUS="${red}Not installed!${default} " KLIPPERSCREEN_STATUS="${red}Not installed!${default} "
else else
KLIPPERSCREEN_STATUS="${yellow}Incomplete!${default} " KLIPPERSCREEN_STATUS="${yellow}Incomplete!${default} "
@@ -212,7 +212,7 @@ print_branch(){
elif [ "$GET_BRANCH" == "Arksine/dev-moonraker-testing" ]; then elif [ "$GET_BRANCH" == "Arksine/dev-moonraker-testing" ]; then
PRINT_BRANCH="moonraker " PRINT_BRANCH="moonraker "
else else
PRINT_BRANCH="${red}----${default} " PRINT_BRANCH="${red}--------------${default} "
fi fi
} }
@@ -221,7 +221,7 @@ read_local_klipper_commit(){
cd $KLIPPER_DIR cd $KLIPPER_DIR
LOCAL_COMMIT=$(git rev-parse --short=8 HEAD) LOCAL_COMMIT=$(git rev-parse --short=8 HEAD)
else else
LOCAL_COMMIT="${red}--------${default}" LOCAL_COMMIT=$NONE
fi fi
} }
@@ -236,7 +236,7 @@ read_remote_klipper_commit(){
REMOTE_COMMIT=$(git rev-parse --short=8 $GET_BRANCH) REMOTE_COMMIT=$(git rev-parse --short=8 $GET_BRANCH)
fi fi
else else
REMOTE_COMMIT="${red}--------${default}" REMOTE_COMMIT=$NONE
fi fi
} }
@@ -244,13 +244,13 @@ compare_klipper_versions(){
unset KLIPPER_UPDATE_AVAIL unset KLIPPER_UPDATE_AVAIL
read_local_klipper_commit && read_remote_klipper_commit read_local_klipper_commit && read_remote_klipper_commit
if [ "$LOCAL_COMMIT" != "$REMOTE_COMMIT" ]; then if [ "$LOCAL_COMMIT" != "$REMOTE_COMMIT" ]; then
LOCAL_COMMIT="${yellow}$LOCAL_COMMIT${default}" LOCAL_COMMIT="${yellow}$(printf "%-12s" "$LOCAL_COMMIT")${default}"
REMOTE_COMMIT="${green}$REMOTE_COMMIT${default}" REMOTE_COMMIT="${green}$(printf "%-12s" "$REMOTE_COMMIT")${default}"
KLIPPER_UPDATE_AVAIL="true" KLIPPER_UPDATE_AVAIL="true"
update_arr+=(update_klipper) update_arr+=(update_klipper)
else else
LOCAL_COMMIT="${green}$LOCAL_COMMIT${default}" LOCAL_COMMIT="${green}$(printf "%-12s" "$LOCAL_COMMIT")${default}"
REMOTE_COMMIT="${green}$REMOTE_COMMIT${default}" REMOTE_COMMIT="${green}$(printf "%-12s" "$REMOTE_COMMIT")${default}"
KLIPPER_UPDATE_AVAIL="false" KLIPPER_UPDATE_AVAIL="false"
fi fi
} }
@@ -265,8 +265,8 @@ read_dwc2fk_versions(){
LOCAL_DWC2FK_COMMIT=$(git rev-parse --short=8 HEAD) LOCAL_DWC2FK_COMMIT=$(git rev-parse --short=8 HEAD)
REMOTE_DWC2FK_COMMIT=$(git rev-parse --short=8 origin/master) REMOTE_DWC2FK_COMMIT=$(git rev-parse --short=8 origin/master)
else else
LOCAL_DWC2FK_COMMIT="${red}--------${default}" LOCAL_DWC2FK_COMMIT=$NONE
REMOTE_DWC2FK_COMMIT="${red}--------${default}" REMOTE_DWC2FK_COMMIT=$NONE
fi fi
} }
@@ -274,13 +274,13 @@ compare_dwc2fk_versions(){
unset DWC2FK_UPDATE_AVAIL unset DWC2FK_UPDATE_AVAIL
read_dwc2fk_versions read_dwc2fk_versions
if [ "$LOCAL_DWC2FK_COMMIT" != "$REMOTE_DWC2FK_COMMIT" ]; then if [ "$LOCAL_DWC2FK_COMMIT" != "$REMOTE_DWC2FK_COMMIT" ]; then
LOCAL_DWC2FK_COMMIT="${yellow}$LOCAL_DWC2FK_COMMIT${default}" LOCAL_DWC2FK_COMMIT="${yellow}$(printf "%-12s" "$LOCAL_DWC2FK_COMMIT")${default}"
REMOTE_DWC2FK_COMMIT="${green}$REMOTE_DWC2FK_COMMIT${default}" REMOTE_DWC2FK_COMMIT="${green}$(printf "%-12s" "$REMOTE_DWC2FK_COMMIT")${default}"
DWC2FK_UPDATE_AVAIL="true" DWC2FK_UPDATE_AVAIL="true"
update_arr+=(update_dwc2fk) update_arr+=(update_dwc2fk)
else else
LOCAL_DWC2FK_COMMIT="${green}$LOCAL_DWC2FK_COMMIT${default}" LOCAL_DWC2FK_COMMIT="${green}$(printf "%-12s" "$LOCAL_DWC2FK_COMMIT")${default}"
REMOTE_DWC2FK_COMMIT="${green}$REMOTE_DWC2FK_COMMIT${default}" REMOTE_DWC2FK_COMMIT="${green}$(printf "%-12s" "$REMOTE_DWC2FK_COMMIT")${default}"
DWC2FK_UPDATE_AVAIL="false" DWC2FK_UPDATE_AVAIL="false"
fi fi
} }
@@ -298,7 +298,7 @@ read_local_dwc2_version(){
read_remote_dwc2_version(){ read_remote_dwc2_version(){
#remote checks don't work without curl installed! #remote checks don't work without curl installed!
if [[ ! $(dpkg-query -f'${Status}' --show curl 2>/dev/null) = *\ installed ]]; then if [[ ! $(dpkg-query -f'${Status}' --show curl 2>/dev/null) = *\ installed ]]; then
DWC2_REMOTE_VER="${red}------------${default}" DWC2_REMOTE_VER=$NONE
else else
get_dwc2_ver get_dwc2_ver
DWC2_REMOTE_VER=$DWC2_VERSION DWC2_REMOTE_VER=$DWC2_VERSION
@@ -318,7 +318,7 @@ compare_dwc2_versions(){
# set flag for the multi update function # set flag for the multi update function
DWC2_UPDATE_AVAIL="true" && update_arr+=(update_dwc2) DWC2_UPDATE_AVAIL="true" && update_arr+=(update_dwc2)
else else
DWC2_LOCAL_VER="${red}------------${default}" DWC2_LOCAL_VER=$NONE
DWC2_REMOTE_VER="${green}$(printf "%-12s" "$DWC2_REMOTE_VER")${default}" DWC2_REMOTE_VER="${green}$(printf "%-12s" "$DWC2_REMOTE_VER")${default}"
DWC2_UPDATE_AVAIL="false" DWC2_UPDATE_AVAIL="false"
fi fi
@@ -334,8 +334,8 @@ read_moonraker_versions(){
LOCAL_MOONRAKER_COMMIT=$(git rev-parse --short=8 HEAD) LOCAL_MOONRAKER_COMMIT=$(git rev-parse --short=8 HEAD)
REMOTE_MOONRAKER_COMMIT=$(git rev-parse --short=8 origin/master) REMOTE_MOONRAKER_COMMIT=$(git rev-parse --short=8 origin/master)
else else
LOCAL_MOONRAKER_COMMIT="${red}--------${default}" LOCAL_MOONRAKER_COMMIT=$NONE
REMOTE_MOONRAKER_COMMIT="${red}--------${default}" REMOTE_MOONRAKER_COMMIT=$NONE
fi fi
} }
@@ -343,13 +343,13 @@ compare_moonraker_versions(){
unset MOONRAKER_UPDATE_AVAIL unset MOONRAKER_UPDATE_AVAIL
read_moonraker_versions read_moonraker_versions
if [ "$LOCAL_MOONRAKER_COMMIT" != "$REMOTE_MOONRAKER_COMMIT" ]; then if [ "$LOCAL_MOONRAKER_COMMIT" != "$REMOTE_MOONRAKER_COMMIT" ]; then
LOCAL_MOONRAKER_COMMIT="${yellow}$LOCAL_MOONRAKER_COMMIT${default}" LOCAL_MOONRAKER_COMMIT="${yellow}$(printf "%-12s" "$LOCAL_MOONRAKER_COMMIT")${default}"
REMOTE_MOONRAKER_COMMIT="${green}$REMOTE_MOONRAKER_COMMIT${default}" REMOTE_MOONRAKER_COMMIT="${green}$(printf "%-12s" "$REMOTE_MOONRAKER_COMMIT")${default}"
MOONRAKER_UPDATE_AVAIL="true" MOONRAKER_UPDATE_AVAIL="true"
update_arr+=(update_moonraker) update_arr+=(update_moonraker)
else else
LOCAL_MOONRAKER_COMMIT="${green}$LOCAL_MOONRAKER_COMMIT${default}" LOCAL_MOONRAKER_COMMIT="${green}$(printf "%-12s" "$LOCAL_MOONRAKER_COMMIT")${default}"
REMOTE_MOONRAKER_COMMIT="${green}$REMOTE_MOONRAKER_COMMIT${default}" REMOTE_MOONRAKER_COMMIT="${green}$(printf "%-12s" "$REMOTE_MOONRAKER_COMMIT")${default}"
MOONRAKER_UPDATE_AVAIL="false" MOONRAKER_UPDATE_AVAIL="false"
fi fi
} }
@@ -367,7 +367,7 @@ read_local_mainsail_version(){
read_remote_mainsail_version(){ read_remote_mainsail_version(){
#remote checks don't work without curl installed! #remote checks don't work without curl installed!
if [[ ! $(dpkg-query -f'${Status}' --show curl 2>/dev/null) = *\ installed ]]; then if [[ ! $(dpkg-query -f'${Status}' --show curl 2>/dev/null) = *\ installed ]]; then
MAINSAIL_REMOTE_VER="${red}------------${default}" MAINSAIL_REMOTE_VER=$NONE
else else
get_mainsail_ver get_mainsail_ver
MAINSAIL_REMOTE_VER=$MAINSAIL_VERSION MAINSAIL_REMOTE_VER=$MAINSAIL_VERSION
@@ -387,7 +387,7 @@ compare_mainsail_versions(){
# set flag for the multi update function # set flag for the multi update function
MAINSAIL_UPDATE_AVAIL="true" && update_arr+=(update_mainsail) MAINSAIL_UPDATE_AVAIL="true" && update_arr+=(update_mainsail)
else else
MAINSAIL_LOCAL_VER="${red}------------${default}" MAINSAIL_LOCAL_VER=$NONE
MAINSAIL_REMOTE_VER="${green}$(printf "%-12s" "$MAINSAIL_REMOTE_VER")${default}" MAINSAIL_REMOTE_VER="${green}$(printf "%-12s" "$MAINSAIL_REMOTE_VER")${default}"
MAINSAIL_UPDATE_AVAIL="false" MAINSAIL_UPDATE_AVAIL="false"
fi fi
@@ -406,7 +406,7 @@ read_local_fluidd_version(){
read_remote_fluidd_version(){ read_remote_fluidd_version(){
#remote checks don't work without curl installed! #remote checks don't work without curl installed!
if [[ ! $(dpkg-query -f'${Status}' --show curl 2>/dev/null) = *\ installed ]]; then if [[ ! $(dpkg-query -f'${Status}' --show curl 2>/dev/null) = *\ installed ]]; then
FLUIDD_REMOTE_VER="${red}------------${default}" FLUIDD_REMOTE_VER=$NONE
else else
get_fluidd_ver get_fluidd_ver
FLUIDD_REMOTE_VER=$FLUIDD_VERSION FLUIDD_REMOTE_VER=$FLUIDD_VERSION
@@ -426,7 +426,7 @@ compare_fluidd_versions(){
# set flag for the multi update function # set flag for the multi update function
FLUIDD_UPDATE_AVAIL="true" && update_arr+=(update_fluidd) FLUIDD_UPDATE_AVAIL="true" && update_arr+=(update_fluidd)
else else
FLUIDD_LOCAL_VER="${red}------------${default}" FLUIDD_LOCAL_VER=$NONE
FLUIDD_REMOTE_VER="${green}$(printf "%-12s" "$FLUIDD_REMOTE_VER")${default}" FLUIDD_REMOTE_VER="${green}$(printf "%-12s" "$FLUIDD_REMOTE_VER")${default}"
FLUIDD_UPDATE_AVAIL="false" FLUIDD_UPDATE_AVAIL="false"
fi fi
@@ -436,13 +436,13 @@ read_klipperscreen_versions(){
if [ -d $KLIPPERSCREEN_DIR ] && [ -d $KLIPPERSCREEN_DIR/.git ]; then if [ -d $KLIPPERSCREEN_DIR ] && [ -d $KLIPPERSCREEN_DIR/.git ]; then
cd $KLIPPERSCREEN_DIR cd $KLIPPERSCREEN_DIR
git fetch origin master -q git fetch origin master -q
LOCAL_KLIPPERSCREEN_COMMIT=$(git describe HEAD --always --tags | cut -d "-" -f 1,2) LOCAL_KLIPPERSCREEN_COMMIT=$(git rev-parse --short=8 HEAD)
LOCAL_KLIPPERSCREEN_COMMIT=$LOCAL_KLIPPERSCREEN_COMMIT$(printf "%$[12-${#LOCAL_KLIPPERSCREEN_COMMIT}]s") #LOCAL_KLIPPERSCREEN_COMMIT=$(git describe HEAD --always --tags | cut -d "-" -f 1,2)
REMOTE_KLIPPERSCREEN_COMMIT=$(git describe origin/master --always --tags | cut -d "-" -f 1,2) REMOTE_KLIPPERSCREEN_COMMIT=$(git rev-parse --short=8 origin/master)
REMOTE_KLIPPERSCREEN_COMMIT=$REMOTE_KLIPPERSCREEN_COMMIT$(printf "%$[12-${#REMOTE_KLIPPERSCREEN_COMMIT}]s") #REMOTE_KLIPPERSCREEN_COMMIT=$(git describe origin/master --always --tags | cut -d "-" -f 1,2)
else else
LOCAL_KLIPPERSCREEN_COMMIT="${red}--------${default}" LOCAL_KLIPPERSCREEN_COMMIT=$NONE
REMOTE_KLIPPERSCREEN_COMMIT="${red}--------${default}" REMOTE_KLIPPERSCREEN_COMMIT=$NONE
fi fi
} }
@@ -450,13 +450,13 @@ compare_klipperscreen_versions(){
unset KLIPPERSCREEN_UPDATE_AVAIL unset KLIPPERSCREEN_UPDATE_AVAIL
read_klipperscreen_versions read_klipperscreen_versions
if [ "$LOCAL_KLIPPERSCREEN_COMMIT" != "$REMOTE_KLIPPERSCREEN_COMMIT" ]; then if [ "$LOCAL_KLIPPERSCREEN_COMMIT" != "$REMOTE_KLIPPERSCREEN_COMMIT" ]; then
LOCAL_KLIPPERSCREEN_COMMIT="${yellow}$LOCAL_KLIPPERSCREEN_COMMIT${default}" LOCAL_KLIPPERSCREEN_COMMIT="${yellow}$(printf "%-12s" "$LOCAL_KLIPPERSCREEN_COMMIT")${default}"
REMOTE_KLIPPERSCREEN_COMMIT="${green}$REMOTE_KLIPPERSCREEN_COMMIT${default}" REMOTE_KLIPPERSCREEN_COMMIT="${green}$(printf "%-12s" "$REMOTE_KLIPPERSCREEN_COMMIT")${default}"
KLIPPERSCREEN_UPDATE_AVAIL="true" KLIPPERSCREEN_UPDATE_AVAIL="true"
update_arr+=(update_klipperscreen) update_arr+=(update_klipperscreen)
else else
LOCAL_KLIPPERSCREEN_COMMIT="${green}$LOCAL_KLIPPERSCREEN_COMMIT${default}" LOCAL_KLIPPERSCREEN_COMMIT="${green}$(printf "%-12s" "$LOCAL_KLIPPERSCREEN_COMMIT")${default}"
REMOTE_KLIPPERSCREEN_COMMIT="${green}$REMOTE_KLIPPERSCREEN_COMMIT${default}" REMOTE_KLIPPERSCREEN_COMMIT="${green}$(printf "%-12s" "$REMOTE_KLIPPERSCREEN_COMMIT")${default}"
KLIPPERSCREEN_UPDATE_AVAIL="false" KLIPPERSCREEN_UPDATE_AVAIL="false"
fi fi
} }
@@ -464,6 +464,9 @@ compare_klipperscreen_versions(){
############################################################# #############################################################
############################################################# #############################################################
#display this as placeholder if no version/commit could be fetched
NONE="${red}$(printf "%-12s" "--------")${default}"
ui_print_versions(){ ui_print_versions(){
unset update_arr unset update_arr
compare_klipper_versions compare_klipper_versions

2
scripts/ui/remove_menu.sh
View File

@@ -18,7 +18,7 @@ remove_ui(){
echo -e "| | 7) [Nginx] | " echo -e "| | 7) [Nginx] | "
echo -e "| | | " echo -e "| | | "
echo -e "| | HDMI Screen: | " echo -e "| | HDMI Screen: | "
echo -e "| | 8) KlipperScreen | " echo -e "| | 8) [KlipperScreen] | "
quit_footer quit_footer
} }