diff --git a/src/freedombone b/src/freedombone index de70a8b3..02e69293 100755 --- a/src/freedombone +++ b/src/freedombone @@ -1544,8 +1544,7 @@ function mesh_cjdns { git stash git checkout master git pull - git checkout $CJDNS_COMMIT - git checkout -b $CJDNS_COMMIT + git checkout $CJDNS_COMMIT -b $CJDNS_COMMIT sed -i "s/cjdns commit.*/cjdns commit:$CJDNS_COMMIT/g" $COMPLETION_FILE ./do fi @@ -1575,8 +1574,7 @@ function mesh_cjdns { git clone $CJDNS_REPO /etc/cjdns cd /etc/cjdns - git checkout $CJDNS_COMMIT - git checkout -b $CJDNS_COMMIT + git checkout $CJDNS_COMMIT -b $CJDNS_COMMIT if ! grep -q "cjdns commit" $COMPLETION_FILE; then echo "cjdns commit:$CJDNS_COMMIT" >> $COMPLETION_FILE else @@ -1875,8 +1873,7 @@ function install_zeronet_blog { git stash git checkout master git pull - git checkout $ZERONET_BLOG_COMMIT - git checkout -b $ZERONET_BLOG_COMMIT + git checkout $ZERONET_BLOG_COMMIT -b $ZERONET_BLOG_COMMIT sed -i "s/ZeroNet Blog commit.*/ZeroNet Blog commit:$ZERONET_BLOG_COMMIT/g" $COMPLETION_FILE fi else @@ -1939,8 +1936,7 @@ function install_zeronet_blog { exit 6739 fi cd /opt/zeronet/ZeroBlog - git checkout $ZERONET_BLOG_COMMIT - git checkout -b $ZERONET_BLOG_COMMIT + git checkout $ZERONET_BLOG_COMMIT -b $ZERONET_BLOG_COMMIT if ! grep -q "ZeroNet Blog commit" $COMPLETION_FILE; then echo "ZeroNet Blog commit:$ZERONET_BLOG_COMMIT" >> $COMPLETION_FILE else @@ -2004,8 +2000,7 @@ function install_zeronet_forum { git stash git checkout master git pull - git checkout $ZERONET_FORUM_COMMIT - git checkout -b $ZERONET_FORUM_COMMIT + git checkout $ZERONET_FORUM_COMMIT -b $ZERONET_FORUM_COMMIT sed -i "s/ZeroNet Forum commit.*/ZeroNet Forum commit:$ZERONET_FORUM_COMMIT/g" $COMPLETION_FILE fi else @@ -2067,8 +2062,7 @@ function install_zeronet_forum { echo $'ZeroTalk repo could not be cloned' exit 6739 fi - git checkout $ZERONET_FORUM_COMMIT - git checkout -b $ZERONET_FORUM_COMMIT + git checkout $ZERONET_FORUM_COMMIT -b $ZERONET_FORUM_COMMIT if ! grep -q "ZeroNet Forum commit" $COMPLETION_FILE; then echo "ZeroNet Forum commit:$ZERONET_FORUM_COMMIT" >> $COMPLETION_FILE else @@ -2127,8 +2121,7 @@ function install_zeronet { git stash git checkout master git pull - git checkout $ZERONET_COMMIT - git checkout -b $ZERONET_COMMIT + git checkout $ZERONET_COMMIT -b $ZERONET_COMMIT sed -i "s/ZeroNet commit.*/ZeroNet commit:$ZERONET_COMMIT/g" $COMPLETION_FILE systemctl restart zeronet.service fi @@ -2151,8 +2144,7 @@ function install_zeronet { exit 56823 fi cd /opt/zeronet - git checkout $ZERONET_COMMIT - git checkout -b $ZERONET_COMMIT + git checkout $ZERONET_COMMIT -b $ZERONET_COMMIT if ! grep -q "ZeroNet commit" $COMPLETION_FILE; then echo "ZeroNet commit:$ZERONET_COMMIT" >> $COMPLETION_FILE else @@ -4656,8 +4648,7 @@ function encrypt_incoming_email { git stash git checkout master git pull - git checkout $GPGIT_COMMIT - git checkout -b $GPGIT_COMMIT + git checkout $GPGIT_COMMIT -b $GPGIT_COMMIT sed -i "s/gpgit commit.*/gpgit commit:$GPGIT_COMMIT/g" $COMPLETION_FILE cp gpgit.pl /usr/bin/gpgit.pl fi @@ -4679,8 +4670,7 @@ function encrypt_incoming_email { cd $INSTALL_DIR git clone $GPGIT_REPO cd $INSTALL_DIR/gpgit - git checkout $GPGIT_COMMIT - git checkout -b $GPGIT_COMMIT + git checkout $GPGIT_COMMIT -b $GPGIT_COMMIT if ! grep -q "gpgit commit" $COMPLETION_FILE; then echo "gpgit commit:$GPGIT_COMMIT" >> $COMPLETION_FILE else @@ -5053,8 +5043,7 @@ function email_archiving { git stash git checkout master git pull - git checkout $CLEANUP_MAILDIR_COMMIT - git checkout -b $CLEANUP_MAILDIR_COMMIT + git checkout $CLEANUP_MAILDIR_COMMIT -b $CLEANUP_MAILDIR_COMMIT sed -i "s/cleanup-maildir commit.*/cleanup-maildir commit:$CLEANUP_MAILDIR_COMMIT/g" $COMPLETION_FILE cp $INSTALL_DIR/cleanup-maildir/cleanup-maildir /usr/bin fi @@ -5072,8 +5061,7 @@ function email_archiving { fi cd $INSTALL_DIR git clone $CLEANUP_MAILDIR_REPO $INSTALL_DIR/cleanup-maildir - git checkout $CLEANUP_MAILDIR_COMMIT - git checkout -b $CLEANUP_MAILDIR_COMMIT + git checkout $CLEANUP_MAILDIR_COMMIT -b $CLEANUP_MAILDIR_COMMIT if ! grep -q "cleanup-maildir commit" $COMPLETION_FILE; then echo "cleanup-maildir commit:$CLEANUP_MAILDIR_COMMIT" >> $COMPLETION_FILE else @@ -5366,8 +5354,7 @@ function install_web_server { git stash git checkout master git pull - git checkout $NGINX_ENSITE_COMMIT - git checkout -b $NGINX_ENSITE_COMMIT + git checkout $NGINX_ENSITE_COMMIT -b $NGINX_ENSITE_COMMIT sed -i "s/Nginx-ensite commit.*/Nginx-ensite commit:$NGINX_ENSITE_COMMIT/g" $COMPLETION_FILE make install fi @@ -5489,8 +5476,7 @@ function install_web_server { cd $INSTALL_DIR git clone $NGINX_ENSITE_REPO $INSTALL_DIR/nginx_ensite cd $INSTALL_DIR/nginx_ensite - git checkout $NGINX_ENSITE_COMMIT - git checkout -b $NGINX_ENSITE_COMMIT + git checkout $NGINX_ENSITE_COMMIT -b $NGINX_ENSITE_COMMIT if ! grep -q "Nginx-ensite commit" $COMPLETION_FILE; then echo "Nginx-ensite commit:$NGINX_ENSITE_COMMIT" >> $COMPLETION_FILE else @@ -5680,8 +5666,7 @@ function install_owncloud_music_app { git stash git checkout master git pull - git checkout $OWNCLOUD_MUSIC_APP_COMMIT - git checkout -b $OWNCLOUD_MUSIC_APP_COMMIT + git checkout $OWNCLOUD_MUSIC_APP_COMMIT -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 @@ -5696,8 +5681,7 @@ function install_owncloud_music_app { cd /usr/share/owncloud/apps git clone $OWNCLOUD_MUSIC_APP_REPO Music cd music - git checkout $OWNCLOUD_MUSIC_APP_COMMIT - git checkout -b $OWNCLOUD_MUSIC_APP_COMMIT + git checkout $OWNCLOUD_MUSIC_APP_COMMIT -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 @@ -6030,8 +6014,7 @@ function install_gogs { git stash git checkout master git pull - git checkout $GOGS_COMMIT - git checkout -b $GOGS_COMMIT + git checkout $GOGS_COMMIT -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 @@ -6072,8 +6055,7 @@ function install_gogs { cd $GOPATH/src/github.com/gogits git clone $GIT_DOMAIN_REPO cd gogs - git checkout $GOGS_COMMIT - git checkout -b $GOGS_COMMIT + git checkout $GOGS_COMMIT -b $GOGS_COMMIT if ! grep -q "Gogs commit" $COMPLETION_FILE; then echo "Gogs commit:$GOGS_COMMIT" >> $COMPLETION_FILE else @@ -6303,8 +6285,7 @@ function install_tox_node { git stash git checkout master git pull - git checkout $TOX_COMMIT - git checkout -b $TOX_COMMIT + git checkout $TOX_COMMIT -b $TOX_COMMIT sed -i "s/toxcore commit.*/toxcore commit:$TOX_COMMIT/g" $COMPLETION_FILE autoreconf -i ./configure --enable-daemon @@ -6331,8 +6312,7 @@ function install_tox_node { git clone $TOX_REPO cd $INSTALL_DIR/toxcore - git checkout $TOX_COMMIT - git checkout -b $TOX_COMMIT + git checkout $TOX_COMMIT -b $TOX_COMMIT if ! grep -q "toxcore commit" $COMPLETION_FILE; then echo "toxcore commit:$TOX_COMMIT" >> $COMPLETION_FILE else @@ -6464,8 +6444,7 @@ function install_tox_client { git stash git checkout master git pull - git checkout $TOXIC_COMMIT - git checkout -b $TOXIC_COMMIT + git checkout $TOXIC_COMMIT -b $TOXIC_COMMIT sed -i "s/Toxic commit.*/Toxic commit:$TOXIC_COMMIT/g" $COMPLETION_FILE make make install @@ -6484,8 +6463,7 @@ function install_tox_client { cd $INSTALL_DIR git clone $TOXIC_REPO cd $INSTALL_DIR/toxic - git checkout $TOXIC_COMMIT - git checkout -b $TOXIC_COMMIT + git checkout $TOXIC_COMMIT -b $TOXIC_COMMIT if ! grep -q "Toxic commit" $COMPLETION_FILE; then echo "Toxic commit:$TOXIC_COMMIT" >> $COMPLETION_FILE else @@ -7059,8 +7037,7 @@ function install_blog { git stash git checkout master git pull - git checkout $FULLBLOG_COMMIT - git checkout -b $FULLBLOG_COMMIT + git checkout $FULLBLOG_COMMIT -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 @@ -7080,8 +7057,7 @@ function install_blog { cd /var/www/$FULLBLOG_DOMAIN_NAME git clone $FULLBLOG_REPO htdocs cd htdocs - git checkout $FULLBLOG_COMMIT - git checkout -b $FULLBLOG_COMMIT + git checkout $FULLBLOG_COMMIT -b $FULLBLOG_COMMIT if ! grep -q "Blog commit" $COMPLETION_FILE; then echo "Blog commit:$FULLBLOG_COMMIT" >> $COMPLETION_FILE else @@ -7341,8 +7317,7 @@ function install_gnu_social { git stash git checkout master git pull - git checkout $GNUSOCIAL_COMMIT - git checkout -b $GNUSOCIAL_COMMIT + git checkout $GNUSOCIAL_COMMIT -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 @@ -7373,8 +7348,7 @@ function install_gnu_social { git clone $MICROBLOG_REPO gnusocial cd gnusocial - git checkout $GNUSOCIAL_COMMIT - git checkout -b $GNUSOCIAL_COMMIT + git checkout $GNUSOCIAL_COMMIT -b $GNUSOCIAL_COMMIT if ! grep -q "GNU Social commit" $COMPLETION_FILE; then echo "GNU Social commit:$GNUSOCIAL_COMMIT" >> $COMPLETION_FILE else @@ -7625,8 +7599,7 @@ function install_hubzilla { git stash git checkout master git pull - git checkout $HUBZILLA_COMMIT - git checkout -b $HUBZILLA_COMMIT + git checkout $HUBZILLA_COMMIT -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 @@ -7656,8 +7629,7 @@ function install_hubzilla { if [ ! -f /var/www/$HUBZILLA_DOMAIN_NAME/htdocs/index.php ]; then cd $INSTALL_DIR git clone $HUBZILLA_REPO hubzilla - git checkout $HUBZILLA_COMMIT - git checkout -b $HUBZILLA_COMMIT + git checkout $HUBZILLA_COMMIT -b $HUBZILLA_COMMIT if ! grep -q "Hubzilla commit" $COMPLETION_FILE; then echo "Hubzilla commit:$HUBZILLA_COMMIT" >> $COMPLETION_FILE else @@ -8396,8 +8368,7 @@ function install_dynamicdns { git stash git checkout master git pull - git checkout $INADYN_COMMIT - git checkout -b $INADYN_COMMIT + git checkout $INADYN_COMMIT -b $INADYN_COMMIT sed -i "s/inadyn commit.*/inadyn commit:$INADYN_COMMIT/g" $COMPLETION_FILE ./configure USE_OPENSSL=1 make @@ -8427,8 +8398,7 @@ function install_dynamicdns { exit 6785 fi cd $INSTALL_DIR/inadyn - git checkout $INADYN_COMMIT - git checkout -b $INADYN_COMMIT + git checkout $INADYN_COMMIT -b $INADYN_COMMIT if ! grep -q "inadyn commit" $COMPLETION_FILE; then echo "inadyn commit:$INADYN_COMMIT" >> $COMPLETION_FILE else @@ -8512,8 +8482,7 @@ function install_ipfs { git stash git checkout master git pull - git checkout $IPFS_COMMIT - git checkout -b $IPFS_COMMIT + git checkout $IPFS_COMMIT -b $IPFS_COMMIT sed -i "s/ipfs commit.*/ipfs commit:$IPFS_COMMIT/g" $COMPLETION_FILE chown -R git:git /home/git systemctl restart ipfs @@ -8565,8 +8534,7 @@ function install_ipfs { fi cd /home/git/go/src/github.com/ipfs/go-ipfs - git checkout $IPFS_COMMIT - git checkout -b $IPFS_COMMIT + git checkout $IPFS_COMMIT -b $IPFS_COMMIT if ! grep -q "ipfs commit" $COMPLETION_FILE; then echo "ipfs commit:$IPFS_COMMIT" >> $COMPLETION_FILE else