diff --git a/scripts/gplan-init-build.sh b/scripts/gplan-init-build.sh index 6ac69df..b154758 100755 --- a/scripts/gplan-init-build.sh +++ b/scripts/gplan-init-build.sh @@ -31,30 +31,20 @@ if [ ! -e $GPLAN_IMG ]; then mv $GPLAN_IMG.tmp $GPLAN_IMG fi -# Get repos -function fetch_local_repo() { - mkdir -p $1 - git -C $1 init - git -C $1 fetch -t "$2" $3 - git -C $1 reset --hard FETCH_HEAD -} - mkdir -p rpi-share || true if [ ! -e rpi-share/cbang ]; then - if [ "$CBANG_HOME" != "" ]; then - fetch_local_repo rpi-share/cbang "$CBANG_HOME" master - else - git clone https://github.com/CauldronDevelopmentLLC/cbang \ - rpi-share/cbang - fi + mkdir -p rpi-share/cbang + git -C rpi-share/cbang init + git -C rpi-share/cbang remote add origin https://github.com/CauldronDevelopmentLLC/cbang + git -C rpi-share/cbang fetch --depth 1 origin 18f1e963107ef26abe750c023355a5c40dd07853 + git -C rpi-share/cbang reset --hard FETCH_HEAD fi if [ ! -e rpi-share/camotics ]; then - if [ "$CAMOTICS_HOME" != "" ]; then - fetch_local_repo rpi-share/camotics "$CAMOTICS_HOME" master - else - git clone https://github.com/CauldronDevelopmentLLC/camotics \ - rpi-share/camotics - fi + mkdir -p rpi-share/camotics + git -C rpi-share/camotics init + git -C rpi-share/camotics remote add origin https://github.com/CauldronDevelopmentLLC/camotics + git -C rpi-share/camotics fetch --depth 1 origin ec876c80d20fc19837133087cef0c447df5a939d + git -C rpi-share/camotics reset --hard FETCH_HEAD fi diff --git a/scripts/gplan-init-dev-img.sh b/scripts/gplan-init-dev-img.sh old mode 100644 new mode 100755