Merge pull request submariner-io#127 from skitt/reduce-git-rev-parse

Reduce git rev parse

scripts/build

@@ -1,9 +1,8 @@
 #!/bin/bash
 set -e
 
-source $(git rev-parse --show-toplevel)/scripts/lib/debug_functions
-
-source $(dirname $0)/version
+source $(dirname $0)/lib/debug_functions
+source $(dirname $0)/lib/version
 
 cd $(dirname $0)/..
 mkdir -p bin

scripts/build-routeagent

@@ -1,9 +1,8 @@
 #!/bin/bash
 set -e
 
-source $(git rev-parse --show-toplevel)/scripts/lib/debug_functions
-
-source $(dirname $0)/version
+source $(dirname $0)/lib/debug_functions
+source $(dirname $0)/lib/version
 
 cd $(dirname $0)/..
 mkdir -p bin

scripts/ci

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-source $(git rev-parse --show-toplevel)/scripts/lib/debug_functions
+source $(dirname $0)/lib/debug_functions
 
 cd $(dirname $0)
 ./validate

scripts/codegen

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source $(git rev-parse --show-toplevel)/scripts/lib/debug_functions
+source $(dirname $0)/lib/debug_functions
 
 K8S_IO_DIR="${GOPATH:-~/go}/src/k8s.io"
 CODEGEN_SCRIPT_DIR="${K8S_IO_DIR}/code-generator"

scripts/download

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-source $(git rev-parse --show-toplevel)/scripts/lib/debug_functions
+source $(dirname $0)/lib/debug_functions
 
 cd $(dirname $0)/..
 

scripts/e2e

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-source $(git rev-parse --show-toplevel)/scripts/lib/debug_functions
+source $(dirname $0)/lib/debug_functions
 
 cd $(dirname $0)
 

scripts/entry

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-source $(git rev-parse --show-toplevel)/scripts/lib/debug_functions
+source $(dirname $0)/lib/debug_functions
 
 trap "chown -R $DAPPER_UID:$DAPPER_GID ." exit
 

scripts/version → scripts/lib/version

@@ -1,6 +1,8 @@
-#!/bin/bash
-
-source $(git rev-parse --show-toplevel)/scripts/lib/debug_functions
+# This should only be sourced
+if [ "${0##*/}" = "version" ]; then
+    echo "Don't run me, source me" >&2
+    exit 1
+fi
 
 if [ -n "$(git status --porcelain --untracked-files=no)" ]; then
     DIRTY="-dirty"

scripts/package

@@ -1,9 +1,8 @@
 #!/bin/bash
 set -e
 
-source $(git rev-parse --show-toplevel)/scripts/lib/debug_functions
-
-source $(dirname $0)/version
+source $(dirname $0)/lib/debug_functions
+source $(dirname $0)/lib/version
 
 ARCH=${ARCH:-"amd64"}
 SUFFIX=""

scripts/release

@@ -1,5 +1,5 @@
 #!/bin/bash
 
-source $(git rev-parse --show-toplevel)/scripts/lib/debug_functions
+source $(dirname $0)/lib/debug_functions
 
 exec $(dirname $0)/ci

scripts/test

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-source $(git rev-parse --show-toplevel)/scripts/lib/debug_functions
+source $(dirname $0)/lib/debug_functions
 
 cd $(dirname $0)/..
 

scripts/validate

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-source $(git rev-parse --show-toplevel)/scripts/lib/debug_functions
+source $(dirname $0)/lib/debug_functions
 
 cd $(dirname $0)/..
 

scripts/vendor

@@ -1,9 +1,8 @@
 #!/bin/bash
 set -e
 
-source $(git rev-parse --show-toplevel)/scripts/lib/debug_functions
-
-source $(dirname $0)/version
+source $(dirname $0)/lib/debug_functions
+source $(dirname $0)/lib/version
 
 cd $(dirname $0)/..
 echo "Downloading go modules to cache ----"