netravnen/dn42-roagen
1
0
Fork 0
Code Releases Activity

Update update.sh

Browse source
This commit is contained in:
netravnen 2019-01-04 14:43:52 +00:00
parent 9e0b71787d
commit 3f3404005e
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
update.sh
View file

@ -10,13 +10,13 @@ git -C ../registry/ checkout master --quiet
# Do a git pull beforehand to ensure our repository is up-to-date # Do a git pull beforehand to ensure our repository is up-to-date
git checkout master --quiet git checkout master --quiet
git pull origin master:master --quiet git pull origin master:master --quiet --rebase
# Do the same for sub-repo if exists # Do the same for sub-repo if exists
if [ -d roa/.git/ ] ; then if [ -d roa/.git/ ] ; then
git -C roa/ checkout master --quiet git -C roa/ checkout master --quiet
if [ $(git -C roa/ remote | grep origin) ] ; then if [ $(git -C roa/ remote | grep origin) ] ; then
git -C roa/ pull origin master:master --quiet git -C roa/ pull origin master:master --quiet --rebase
fi fi
fi fi
@ -26,7 +26,7 @@ php rfc8416.php
# Ensure sub-repo is created to track roa file udpates # Ensure sub-repo is created to track roa file udpates
if [ ! -d roa/ ] ; then mkdir roa ; fi if [ ! -d roa/ ] ; then mkdir roa ; fi
if [ ! -d roa/.git/ ] ; then if [ ! -f roa/.git/config ] ; then
git -C roa/ init git -C roa/ init
if [ ! -f roa/README.md ; then if [ ! -f roa/README.md ; then
touch roa/README.md touch roa/README.md