update git settings

This commit is contained in:
ducoterra
2018-10-08 23:21:05 -04:00
parent 345ce7a859
commit 7a2ec49b6d
2 changed files with 3 additions and 4 deletions

View File

@@ -199,17 +199,16 @@ fi
if [ $usegit = True ] ; then if [ $usegit = True ] ; then
echo -e "\tCloning django project" echo -e "\tCloning django project"
ssh-agent bash -c 'ssh-add $gitkey 1>> $gitlogloc 2>> $gitlogloc 3>> $gitlogloc;
git init 1>> $gitlogloc 2>> $gitlogloc 3>> $gitlogloc; git init 1>> $gitlogloc 2>> $gitlogloc 3>> $gitlogloc;
git remote add origin $giturl 1>> $gitlogloc 2>> $gitlogloc 3>> $gitlogloc; git remote add origin $giturl 1>> $gitlogloc 2>> $gitlogloc 3>> $gitlogloc;
git pull origin master 1>> $gitlogloc 2>> $gitlogloc 3>> $gitlogloc;' git pull origin master 1>> $gitlogloc 2>> $gitlogloc 3>> $gitlogloc;
echo -e "\tInstalling pip requirements" echo -e "\tInstalling pip requirements"
pip install -r requirements.txt 1>> $gitlogloc 2>> $gitlogloc 3>> $gitlogloc pip install -r requirements.txt 1>> $gitlogloc 2>> $gitlogloc 3>> $gitlogloc
fi fi
# collect static, migrate # collect static, migrate
echo -e "\tCollecting static" echo -e "\tCollecting static"
python manage.py collectstatic 1>> $djalogloc 2>> $djalogloc 3>> $djalogloc python manage.py collectstatic --noinput 1>> $djalogloc 2>> $djalogloc 3>> $djalogloc
if [ $? -ne 0 ] ; then if [ $? -ne 0 ] ; then
echo -e "Failed to collect static files. $djamsg" echo -e "Failed to collect static files. $djamsg"
exit 1 exit 1

2
vars
View File

@@ -4,7 +4,7 @@ export projectname=""
export hostname="" export hostname=""
export usegit=False # if you have a django git project export usegit=False # if you have a django git project
export giturl="" # url for git project export giturl="" # url for git project
export gitkey="" # IdentityFile # MAKE SURE root HAS A DEPLOY KEY
install_epel_release=False install_epel_release=False
# general install settings # general install settings