From 8a49755219f0a4a6e2a8afa3ee7b372da7e19691 Mon Sep 17 00:00:00 2001 From: sparky4 Date: Fri, 3 Feb 2017 16:05:46 -0600 Subject: [PATCH] fixed wwww now i need to work on map system stuff wwwwwwwwwwwwwww i am also going to work on that fps location stuff --- boop.sh | 2 +- makefile | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/boop.sh b/boop.sh index 0ef32da5..c0348e30 100755 --- a/boop.sh +++ b/boop.sh @@ -1,6 +1,6 @@ #!/bin/bash git commit -a -m "$1" -#git push x4 master +git push x4 master git push origin master git push jp master git push sf master diff --git a/makefile b/makefile index 87425623..0aa855fb 100755 --- a/makefile +++ b/makefile @@ -414,7 +414,7 @@ www: .symbolic @$(REMOVECOMMAND) /var/www/*.exe.zip* @for %f in ($(EXEC)) do @if exist %f @$(COPYCOMMAND) %f /var/www/ @./src/util/z.sh $(EXEC) $(EXEC) - @wmake -h wwwwext + @wmake -h wwwext wwwext: .symbolic ####----@ssh -p $(HOSTPORT) $(HOSTUSER)@$(HOSTADDR) 'rm -f $(HOSTDIR)/16/*exe*' @@ -423,9 +423,6 @@ wwwext: .symbolic @scp -r -P $(HOSTPORT) *get.bat $(HOSTUSER)@$(HOSTADDR):$(HOSTDIR)/16/ @scp -r -P $(HOSTPORT) /var/www/*.exe.zip.* $(HOSTUSER)@$(HOSTADDR):$(HOSTDIR)/16/ @scp -r -P $(HOSTPORT) $(DATADIR)spri.zip $(HOSTUSER)@$(HOSTADDR):$(HOSTDIR)/16/ - @wmake -h wwwwext - -wwwwext: .symbolic #beta.latech.edu @scp -r -P $(HOST2PORT) *.exe $(HOST2USER)@$(HOST2ADDR):$(HOST2DIR)/16/ @scp -r -P $(HOST2PORT) *get.bat $(HOST2USER)@$(HOST2ADDR):$(HOST2DIR)/16/ -- 2.39.2