Checkout before script switch, fix checkout from empty tree.
parent
bc791c2f07
commit
9b1190cedf
|
@ -65,6 +65,14 @@ 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
|
||||
# Putting exit 0 on same line here for security since the old script
|
||||
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue