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

fix: update script

Browse Source 
there is a new way of grabbing the mainsail and fluidd version without reading them from a version file kiauh created in the past.
This commit is contained in:
th33xitus
2020-12-04 19:38:40 +01:00
committed by GitHub
parent 3032356f89
commit 0339f3f4f5
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
resources/autocommit.sh
View File

@@ -29,22 +29,24 @@
grab_version(){ grab_version(){
if [ ! -z "$klipper_folder" ]; then if [ ! -z "$klipper_folder" ]; then
cd "$klipper_folder" cd "$klipper_folder"
klipper_commit=$(git rev-parse --short=8 HEAD) klipper_commit=$(git rev-parse --short=7 HEAD)
m1="Klipper on commit: $klipper_commit" m1="Klipper on commit: $klipper_commit"
cd ${HOME} cd ..
fi fi
if [ ! -z "$moonraker_folder" ]; then if [ ! -z "$moonraker_folder" ]; then
cd "$moonraker_folder" cd "$moonraker_folder"
moonraker_commit=$(git rev-parse --short=8 HEAD) moonraker_commit=$(git rev-parse --short=7 HEAD)
m2="Moonraker on commit: $moonraker_commit" m2="Moonraker on commit: $moonraker_commit"
cd ${HOME} cd ..
fi fi
if [ ! -z "$mainsail_folder" ] && [ -f $mainsail_folder/version ]; then if [ ! -z "$mainsail_folder" ]; then
mainsail_ver=$(head -n 1 $mainsail_folder/version) mainsail_file=$(find $mainsail_folder/js -name "app.*.js" 2>/dev/null)
mainsail_ver=$(grep -o -E 'state:{packageVersion:.+' $mainsail_file | cut -d'"' -f2)
m3="Mainsail version: $mainsail_ver" m3="Mainsail version: $mainsail_ver"
fi fi
if [ ! -z "$fluidd_folder" ] && [ -f $mainsail_folder/version ]; then if [ ! -z "$fluidd_folder" ]; then
fluidd_ver=$(head -n 1 $fluidd_folder/version) fluidd_file=$(find $fluidd_folder/js -name "app.*.js" 2>/dev/null)
fluidd_ver=$(grep -o -E '"setVersion",".+"' $fluidd_file | cut -d'"' -f4)
m4="Fluidd version: $fluidd_ver" m4="Fluidd version: $fluidd_ver"
fi fi
} }
@@ -59,4 +61,4 @@ push_config(){
} }
grab_version grab_version
push_config push_config