adelorenzo/stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure git reset --hard is realy desired

Browse Source
This commit is contained in:
Matthias 2019-08-07 21:45:58 +02:00
parent 831e708897
commit 7a47d81b7b
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
setup.sh
View File

@ -117,12 +117,12 @@ function reset() {
echo "----------------------------" echo "----------------------------"
echo "Reseting branch and virtual env" echo "Reseting branch and virtual env"
echo "----------------------------" echo "----------------------------"
if [ "1" == $(git branch -vv |grep -cE "\* develop|\* master") ] if [ "1" == $(git branch -vv |grep -cE "\* develop|\* master") ]
then then
if [ -d ".env" ]; then
echo "- Delete your previous virtual env" read -p "Reset git branch? (This will remove all changes you made!) [y/N]? "
rm -rf .env if [[ $REPLY =~ ^[Yy]$ ]]; then
fi
git fetch -a git fetch -a
@ -135,10 +135,15 @@ function reset() {
echo "- Hard resetting of 'master' branch." echo "- Hard resetting of 'master' branch."
git reset --hard origin/master git reset --hard origin/master
fi fi
fi
else else
echo "Reset ignored because you are not on 'master' or 'develop'." echo "Reset ignored because you are not on 'master' or 'develop'."
fi fi
if [ -d ".env" ]; then
echo "- Delete your previous virtual env"
rm -rf .env
fi
echo echo
${PYTHON} -m venv .env ${PYTHON} -m venv .env
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then