From 6e3e8185527b06441f1a8b5488a12adf3494429a Mon Sep 17 00:00:00 2001 From: Eduard Urbach Date: Fri, 16 Jun 2017 15:42:22 +0200 Subject: [PATCH] Improved makefile --- jobs/build.sh | 2 +- makefile | 4 ++-- patches/build.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jobs/build.sh b/jobs/build.sh index 0f817f6e..2839f06f 100755 --- a/jobs/build.sh +++ b/jobs/build.sh @@ -1,4 +1,4 @@ #!/bin/sh MYDIR="$(dirname "$(realpath "$0")")" cd "$MYDIR" -for dir in ./*; do ([ -d "$dir" ] && cd "$dir" && echo "Building $dir" && go build); done \ No newline at end of file +for dir in ./*; do ([ -d "$dir" ] && cd "$dir" && echo "Building jobs/$dir" && go build); done \ No newline at end of file diff --git a/makefile b/makefile index 07ee862c..793c3eb8 100644 --- a/makefile +++ b/makefile @@ -28,10 +28,10 @@ assets: depslist: $(GOCMD) list -f {{.Deps}} | sed -e 's/\[//g' -e 's/\]//g' | tr " " "\n" clean: - find . -type f | xargs file | grep "ELF.*executable" | awk -F: '{print $1}' | rm + find . -type f | xargs file | grep "ELF.*executable" | awk -F: '{print $1}' | xargs rm ports: $(IPTABLES) -t nat -A OUTPUT -o lo -p tcp --dport 80 -j REDIRECT --to-port 4000 $(IPTABLES) -t nat -A OUTPUT -o lo -p tcp --dport 443 -j REDIRECT --to-port 4001 all: assets server jobs patches ports -.PHONY: jobs \ No newline at end of file +.PHONY: jobs patches \ No newline at end of file diff --git a/patches/build.sh b/patches/build.sh index 0f817f6e..23ecaaec 100755 --- a/patches/build.sh +++ b/patches/build.sh @@ -1,4 +1,4 @@ #!/bin/sh MYDIR="$(dirname "$(realpath "$0")")" cd "$MYDIR" -for dir in ./*; do ([ -d "$dir" ] && cd "$dir" && echo "Building $dir" && go build); done \ No newline at end of file +for dir in ./*; do ([ -d "$dir" ] && cd "$dir" && echo "Building patches/$dir" && go build); done \ No newline at end of file