diff --git a/70.sh b/70.sh index cf8b70b..90dde6f 100755 --- a/70.sh +++ b/70.sh @@ -41,6 +41,4 @@ cd ${SD70_DIR}/kohya_ss echo LAUNCHING KOHYA_SS ! CMD="python kohya_gui.py"; while IFS= read -r param; do if [[ $param != \#* ]]; then CMD+=" ${param}"; fi; done < "${SD70_DIR}/parameters.txt"; eval $CMD - - wait 99999 \ No newline at end of file diff --git a/functions.sh b/functions.sh index a336e5f..b66b2a0 100644 --- a/functions.sh +++ b/functions.sh @@ -43,10 +43,12 @@ sed 's/\// /g') | cut -f1) ]; then else if [ "$CLEAN_ENV" = "true" ]; then echo "Forced wiping venv for clean packages install" + export active_clean=1 else - echo "Remote branch is ahead. Wiping venv for clean packages install" + echo "Remote branch is ahead. If you encouter any issue after upgrade, try to clean venv for clean packages install" fi - export active_clean=1 + + git reset --hard HEAD git pull -X ours fi } \ No newline at end of file