before updating, save the current klipper commit state in ini

This commit is contained in:
th33xitus
2020-07-26 18:15:36 +02:00
parent 6f30208863
commit dc4cc59038
2 changed files with 36 additions and 2 deletions

View File

@@ -1 +1,7 @@
backup_before_update=false
#don't edit this file if you don't know what you are doing...
backup_before_update=false
previous_origin_state=25a9a32e
previous_smoothing_state=feb966c1
previous_shaping_state=e0b94b7f
previous_moonraker_state=9c29a4fc
previous_dev_moonraker_state=528f9f25

View File

@@ -16,11 +16,12 @@ update_kiauh(){
update_klipper(){
stop_klipper
bb4u "klipper"
if [ ! -d $KLIPPER_DIR ]; then
cd ${HOME} && git clone $KLIPPER_REPO
else
bb4u "klipper"
read_branch
save_klipper_state
status_msg "Updating $GET_BRANCH"
#fetching origin/master -> error
#rewriting origin/master to origin
@@ -64,4 +65,31 @@ update_mainsail(){
status_msg "Updating Mainsail ..."
install_mainsail
start_klipper
}
save_klipper_state(){
source_ini
#read current klipper state
COMMIT_STATE=$(git rev-parse --short HEAD)
if [ $GET_BRANCH = origin/master ]; then
ORI_OLD=$previous_origin_state
ORI_NEW=$COMMIT_STATE
sed -i "/previous_origin_state=/s/$ORI_OLD/$ORI_NEW/" $INI_FILE
elif [ $GET_BRANCH = dmbutyugin/scurve-shaping ]; then
SHA_OLD=$previous_shaping_state
SHA_NEW=$COMMIT_STATE
sed -i "/previous_shaping_state=/s/$SHA_OLD/$SHA_NEW/" $INI_FILE
elif [ $GET_BRANCH = dmbutyugin/scurve-smoothing ]; then
SMO_OLD=$previous_smoothing_state
SMO_NEW=$COMMIT_STATE
sed -i "/previous_smoothing_state=/s/$SMO_OLD/$SMO_NEW/" $INI_FILE
elif [ $GET_BRANCH = Arksine/work-web_server-20200131 ]; then
WWS_OLD=$previous_moonraker_state
WWS_NEW=$COMMIT_STATE
sed -i "/previous_moonraker_state=/s/$WWS_OLD/$WWS_NEW/" $INI_FILE
elif [ $GET_BRANCH = Arksine/dev-moonraker-testing ]; then
DMT_OLD=$previous_dev_moonraker_state
DMT_NEW=$COMMIT_STATE
sed -i "/previous_dev_moonraker_state=/s/$DMT_OLD/$DMT_NEW/" $INI_FILE
fi
}