Checkout before script switch, fix checkout from empty tree.

master
Icedream 2018-02-20 03:05:08 +01:00
parent bc791c2f07
commit 9b1190cedf
Signed by: icedream
GPG Key ID: 1573F6D8EFE4D0CF
1 changed files with 8 additions and 4 deletions

View File

@ -64,6 +64,14 @@ fi
fi
echo "✔"
done
echo "All commits passed, now applying updates..."
if git rev-parse HEAD >/dev/null 2>&1; then
git rebase "${ref}"
else
git checkout -f "${ref}"
fi
git submodule update --init
if file_changed "${HOME}/bin/update-profile" "home/bin/update-profile"; then
# Use new profile update script instead
@ -75,10 +83,6 @@ fi
fi
fi
echo "All commits passed, now applying updates..."
git rebase origin
git submodule update --init
echo "Running package installation..."
cd packages
./packages.sh