diff --git a/Makefile b/Makefile index ef2415c056fd69b8a077319325f7a68001ea20cd..29aca7c7ab845545413fd4f2ef1fd7167ddd7744 100644 --- a/Makefile +++ b/Makefile @@ -84,7 +84,7 @@ distclean: clean ## Web Editor stuff -- this works only with additional manual adjustments background: - @nohup sh -c 'if [ ! -e .background ] ; then touch .background ; rm -f .background-again bjcp-2015-styleguide-de.xml web/bjcp-2015-styleguide-de.xml ; make ; rm .background ; if [ -e .background-again ] ; then rm bjcp-2015-styleguide-de.xml web/bjcp-2015-styleguide-de.xml ; make background ; fi ; else touch .background-again ; fi' >/dev/null 2>&1 & + @nohup sh -c 'if [ ! -e .background ] ; then touch .background ; rm -f .background-again bjcp-2015-styleguide-de.xml web/bjcp-2015-styleguide-de.xml ; make ; if [ -e .git-push ] ; then rm .git-push ; git push ; fi ; rm .background ; if [ -e .background-again ] ; then rm bjcp-2015-styleguide-de.xml web/bjcp-2015-styleguide-de.xml ; make background ; fi ; else touch .background-again ; fi' >/dev/null 2>&1 & install-home: ssh z "cd /var/www ; if [ -d bjcp-2015-styleguide ] ; then cd bjcp-2015-styleguide ; sudo -u www-data git pull ; sudo -u www-data make ; else sudo -u www-data git clone https://github.com/frsteinb/bjcp-2015-styleguide.git ; cd bjcp-2015-styleguide ; sudo -u www-data mkdir web/snippets ; sudo -u www-data make ; fi" diff --git a/web/save.cgi b/web/save.cgi index 292dc051f09b131a03332e09ef610a144da62927..a435b700dff8e42942480698573bb24a0ea2d44b 100755 --- a/web/save.cgi +++ b/web/save.cgi @@ -151,7 +151,8 @@ if os.path.isfile(translatedfilename) or os.path.isfile(origfilename): if os.path.isfile("/var/www/.ssh/id_rsa"): log("pushing to GitHub repository") - cmd = 'git push' + #cmd = 'git push' + cmd = 'touch .git-push' docmd(cmd) log("updating files in the background... otherwise done.")