icedream
/
profile
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
home/bin/update-profile
View File

@ -65,6 +65,14 @@ fi
echo "✔" echo "✔"
done 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 if file_changed "${HOME}/bin/update-profile" "home/bin/update-profile"; then
# Use new profile update script instead # Use new profile update script instead
# Putting exit 0 on same line here for security since the old script # Putting exit 0 on same line here for security since the old script
@ -75,10 +83,6 @@ fi
fi fi
fi fi
echo "All commits passed, now applying updates..."
git rebase origin
git submodule update --init
echo "Running package installation..." echo "Running package installation..."
cd packages cd packages
./packages.sh ./packages.sh