From c73b2b765036d200d8c959581aa5462d9c3c96e0 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sun, 29 Nov 2015 21:48:40 +0000 Subject: [PATCH] Checkout not branch --- src/freedombone | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/src/freedombone b/src/freedombone index 1084504b..fe6bb4e5 100755 --- a/src/freedombone +++ b/src/freedombone @@ -1484,7 +1484,7 @@ function mesh_cjdns { git checkout master git pull git checkout $CJDNS_COMMIT - git branch -b $CJDNS_COMMIT + git checkout -b $CJDNS_COMMIT sed -i "s/cjdns commit.*/cjdns commit:$CJDNS_COMMIT/g" $COMPLETION_FILE ./do fi @@ -1515,7 +1515,7 @@ function mesh_cjdns { cd /etc/cjdns git checkout $CJDNS_COMMIT - git branch -b $CJDNS_COMMIT + git checkout -b $CJDNS_COMMIT if ! grep -q "cjdns commit" $COMPLETION_FILE; then echo "cjdns commit:$CJDNS_COMMIT" >> $COMPLETION_FILE else @@ -2015,7 +2015,7 @@ function install_zeronet { git checkout master git pull git checkout $ZERONET_COMMIT - git branch -b $ZERONET_COMMIT + git checkout -b $ZERONET_COMMIT sed -i "s/ZeroNet commit.*/ZeroNet commit:$ZERONET_COMMIT/g" $COMPLETION_FILE systemctl restart zeronet.service fi @@ -2039,7 +2039,7 @@ function install_zeronet { fi cd /opt/zeronet git checkout $ZERONET_COMMIT - git branch -b $ZERONET_COMMIT + git checkout -b $ZERONET_COMMIT if ! grep -q "ZeroNet commit" $COMPLETION_FILE; then echo "ZeroNet commit:$ZERONET_COMMIT" >> $COMPLETION_FILE else @@ -7657,7 +7657,7 @@ function encrypt_incoming_email { git checkout master git pull git checkout $GPGIT_COMMIT - git branch -b $GPGIT_COMMIT + git checkout -b $GPGIT_COMMIT sed -i "s/gpgit commit.*/gpgit commit:$GPGIT_COMMIT/g" $COMPLETION_FILE cp gpgit.pl /usr/bin/gpgit.pl fi @@ -7680,7 +7680,7 @@ function encrypt_incoming_email { git clone $GPGIT_REPO cd $INSTALL_DIR/gpgit git checkout $GPGIT_COMMIT - git branch -b $GPGIT_COMMIT + git checkout -b $GPGIT_COMMIT if ! grep -q "gpgit commit" $COMPLETION_FILE; then echo "gpgit commit:$GPGIT_COMMIT" >> $COMPLETION_FILE else @@ -8609,7 +8609,7 @@ function install_owncloud_music_app { git checkout master git pull git checkout $OWNCLOUD_MUSIC_APP_COMMIT - git branch -b $OWNCLOUD_MUSIC_APP_COMMIT + git checkout -b $OWNCLOUD_MUSIC_APP_COMMIT sed -i "s/Owncloud music app commit.*/Owncloud music app commit:$OWNCLOUD_MUSIC_APP_COMMIT/g" $COMPLETION_FILE fi else @@ -8625,7 +8625,7 @@ function install_owncloud_music_app { git clone $OWNCLOUD_MUSIC_APP_REPO Music cd music git checkout $OWNCLOUD_MUSIC_APP_COMMIT - git branch -b $OWNCLOUD_MUSIC_APP_COMMIT + git checkout -b $OWNCLOUD_MUSIC_APP_COMMIT if ! grep -q "Owncloud music app commit" $COMPLETION_FILE; then echo "Owncloud music app commit:$OWNCLOUD_MUSIC_APP_COMMIT" >> $COMPLETION_FILE else @@ -8962,7 +8962,7 @@ function install_gogs { git checkout master git pull git checkout $GOGS_COMMIT - git branch -b $GOGS_COMMIT + git checkout -b $GOGS_COMMIT sed -i "s/Gogs commit.*/Gogs commit:$GOGS_COMMIT/g" $COMPLETION_FILE chown -R www-data:www-data /var/www/$GIT_DOMAIN_NAME/htdocs fi @@ -9004,7 +9004,7 @@ function install_gogs { git clone $GIT_DOMAIN_REPO cd gogs git checkout $GOGS_COMMIT - git branch -b $GOGS_COMMIT + git checkout -b $GOGS_COMMIT if ! grep -q "Gogs commit" $COMPLETION_FILE; then echo "Gogs commit:$GOGS_COMMIT" >> $COMPLETION_FILE else @@ -9234,7 +9234,7 @@ function install_tox_node { git checkout master git pull git checkout $TOX_COMMIT - git branch -b $TOX_COMMIT + git checkout -b $TOX_COMMIT sed -i "s/toxcore commit.*/toxcore commit:$TOX_COMMIT/g" $COMPLETION_FILE autoreconf -i ./configure --enable-daemon @@ -9262,7 +9262,7 @@ function install_tox_node { cd $INSTALL_DIR/toxcore git checkout $TOX_COMMIT - git branch -b $TOX_COMMIT + git checkout -b $TOX_COMMIT if ! grep -q "toxcore commit" $COMPLETION_FILE; then echo "toxcore commit:$TOX_COMMIT" >> $COMPLETION_FILE else @@ -9395,7 +9395,7 @@ function install_tox_client { git checkout master git pull git checkout $TOXIC_COMMIT - git branch -b $TOXIC_COMMIT + git checkout -b $TOXIC_COMMIT sed -i "s/Toxic commit.*/Toxic commit:$TOXIC_COMMIT/g" $COMPLETION_FILE make make install @@ -9415,7 +9415,7 @@ function install_tox_client { git clone $TOXIC_REPO cd $INSTALL_DIR/toxic git checkout $TOXIC_COMMIT - git branch -b $TOXIC_COMMIT + git checkout -b $TOXIC_COMMIT if ! grep -q "Toxic commit" $COMPLETION_FILE; then echo "Toxic commit:$TOXIC_COMMIT" >> $COMPLETION_FILE else @@ -9985,7 +9985,7 @@ function install_blog { git checkout master git pull git checkout $FULLBLOG_COMMIT - git branch -b $FULLBLOG_COMMIT + git checkout -b $FULLBLOG_COMMIT sed -i "s/Blog commit.*/Blog commit:$FULLBLOG_COMMIT/g" $COMPLETION_FILE chown -R www-data:www-data /var/www/$FULLBLOG_DOMAIN_NAME/htdocs fi @@ -10006,7 +10006,7 @@ function install_blog { git clone $FULLBLOG_REPO htdocs cd htdocs git checkout $FULLBLOG_COMMIT - git branch -b $FULLBLOG_COMMIT + git checkout -b $FULLBLOG_COMMIT if ! grep -q "Blog commit" $COMPLETION_FILE; then echo "Blog commit:$FULLBLOG_COMMIT" >> $COMPLETION_FILE else @@ -10267,7 +10267,7 @@ function install_gnu_social { git checkout master git pull git checkout $GNUSOCIAL_COMMIT - git branch -b $GNUSOCIAL_COMMIT + git checkout -b $GNUSOCIAL_COMMIT sed -i "s/GNU Social commit.*/GNU Social commit:$GNUSOCIAL_COMMIT/g" $COMPLETION_FILE chown -R www-data:www-data /var/www/$MICROBLOG_DOMAIN_NAME/htdocs fi @@ -10299,7 +10299,7 @@ function install_gnu_social { cd gnusocial git checkout $GNUSOCIAL_COMMIT - git branch -b $GNUSOCIAL_COMMIT + git checkout -b $GNUSOCIAL_COMMIT if ! grep -q "GNU Social commit" $COMPLETION_FILE; then echo "GNU Social commit:$GNUSOCIAL_COMMIT" >> $COMPLETION_FILE else @@ -10550,7 +10550,7 @@ function install_hubzilla { git checkout master git pull git checkout $HUBZILLA_COMMIT - git branch -b $HUBZILLA_COMMIT + git checkout -b $HUBZILLA_COMMIT sed -i "s/Hubzilla commit.*/Hubzilla commit:$HUBZILLA_COMMIT/g" $COMPLETION_FILE chown -R www-data:www-data /var/www/$HUBZILLA_DOMAIN_NAME/htdocs fi @@ -10581,7 +10581,7 @@ function install_hubzilla { cd $INSTALL_DIR git clone $HUBZILLA_REPO hubzilla git checkout $HUBZILLA_COMMIT - git branch -b $HUBZILLA_COMMIT + git checkout -b $HUBZILLA_COMMIT if ! grep -q "Hubzilla commit" $COMPLETION_FILE; then echo "Hubzilla commit:$HUBZILLA_COMMIT" >> $COMPLETION_FILE else @@ -11377,7 +11377,7 @@ function install_dynamicdns { git checkout master git pull git checkout $INADYN_COMMIT - git branch -b $INADYN_COMMIT + git checkout -b $INADYN_COMMIT sed -i "s/inadyn commit.*/inadyn commit:$INADYN_COMMIT/g" $COMPLETION_FILE ./configure USE_OPENSSL=1 make @@ -11406,7 +11406,7 @@ function install_dynamicdns { fi cd $INSTALL_DIR/inadyn git checkout $INADYN_COMMIT - git branch -b $INADYN_COMMIT + git checkout -b $INADYN_COMMIT if ! grep -q "inadyn commit" $COMPLETION_FILE; then echo "inadyn commit:$INADYN_COMMIT" >> $COMPLETION_FILE else @@ -11491,7 +11491,7 @@ function install_ipfs { git checkout master git pull git checkout $IPFS_COMMIT - git branch -b $IPFS_COMMIT + git checkout -b $IPFS_COMMIT sed -i "s/ipfs commit.*/ipfs commit:$IPFS_COMMIT/g" $COMPLETION_FILE chown -R git:git /home/git systemctl restart ipfs @@ -11544,7 +11544,7 @@ function install_ipfs { cd /home/git/go/src/github.com/ipfs/go-ipfs git checkout $IPFS_COMMIT - git branch -b $IPFS_COMMIT + git checkout -b $IPFS_COMMIT if ! grep -q "ipfs commit" $COMPLETION_FILE; then echo "ipfs commit:$IPFS_COMMIT" >> $COMPLETION_FILE else