From 8777349a193cd02bb46ac90d3181e5ccc230d502 Mon Sep 17 00:00:00 2001
From: Alain Mebsout <alainmebsout@gmail.com>
Date: Wed, 12 Apr 2017 12:55:01 +0200
Subject: [PATCH] A few fixes to make things more posix compliant in build/test
 scripts

---
 scripts/create_build_deps_docker_image.sh | 2 +-
 scripts/create_docker_image.sh            | 2 +-
 scripts/install_build_deps.sh             | 4 ++--
 scripts/launch-client.sh                  | 2 +-
 scripts/launch-node.sh                    | 2 +-
 src/Makefile                              | 6 +++---
 test/Makefile.shared                      | 4 ++--
 test/test-basic.sh                        | 4 ++--
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/scripts/create_build_deps_docker_image.sh b/scripts/create_build_deps_docker_image.sh
index 9aded630d..184fd16d5 100755
--- a/scripts/create_build_deps_docker_image.sh
+++ b/scripts/create_build_deps_docker_image.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-script_dir="$(dirname "$(readlink -f "$0")")"
+script_dir="$(cd "$(dirname "$0")" && echo "$(pwd -P)/")"
 src_dir="$(dirname "$script_dir")"
 cd "$src_dir"
 
diff --git a/scripts/create_docker_image.sh b/scripts/create_docker_image.sh
index 3dbfc1a5c..cd72c2b29 100755
--- a/scripts/create_docker_image.sh
+++ b/scripts/create_docker_image.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-script_dir="$(dirname "$(readlink -f "$0")")"
+script_dir="$(cd "$(dirname "$0")" && echo "$(pwd -P)/")"
 src_dir="$(dirname "$script_dir")"
 cd "$src_dir"
 
diff --git a/scripts/install_build_deps.sh b/scripts/install_build_deps.sh
index cb93054f0..51661d5cb 100755
--- a/scripts/install_build_deps.sh
+++ b/scripts/install_build_deps.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-script_dir="$(dirname "$(readlink -f "$0")")"
+script_dir="$(cd "$(dirname "$0")" && echo "$(pwd -P)/")"
 src_dir="$(dirname "$script_dir")"
 
 . "$script_dir/version.sh"
@@ -54,7 +54,7 @@ if "$pin"; then
     opam pin add typerex-build --dev --no-action
     ## Force opam to take account of the new `tezos-deps.opam`
     opam pin --yes remove tezos-deps
-    opam pin --yes add --no-action tezos-deps src
+    opam pin --yes add --no-action tezos-deps $src_dir/src
 fi
 
 if "$depext"; then
diff --git a/scripts/launch-client.sh b/scripts/launch-client.sh
index ec37adc02..d85c985b7 100755
--- a/scripts/launch-client.sh
+++ b/scripts/launch-client.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-script_dir="$(dirname "$(readlink -f "$0")")"
+script_dir="$(cd "$(dirname "$0")" && echo "$(pwd -P)/")"
 src_dir="$(dirname "$script_dir")"
 cd "$src_dir"
 
diff --git a/scripts/launch-node.sh b/scripts/launch-node.sh
index fb3b7656f..21043dd11 100755
--- a/scripts/launch-node.sh
+++ b/scripts/launch-node.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-script_dir="$(dirname "$(readlink -f "$0")")"
+script_dir="$(cd "$(dirname "$0")" && echo "$(pwd -P)/")"
 src_dir="$(dirname "$script_dir")"
 cd "$src_dir"
 
diff --git a/src/Makefile b/src/Makefile
index 455c7aac6..99fcdd2b8 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -314,7 +314,7 @@ partial-clean::
 .PHONY: clean partial-clean
 clean:: partial-clean
 partial-clean::
-	-find \( -name \*.cm\* -or -name \*.cmp -or -name \*.out -or -name \*~ -or -name \*.o -or -name \*.a \) -delete
+	-find . \( -name \*.cm\* -or -name \*.cmp -or -name \*.out -or -name \*~ -or -name \*.o -or -name \*.a \) -delete
 
 ## Dependencies
 
@@ -366,8 +366,8 @@ compiler/tezos_compiler.cmo compiler/tezos_compiler.cmx: \
 
 partial-clean::
 	-rm -f .depend
-	-find \( -name \*.mli.deps -or -name \*.ml.deps \) -delete
-	-find \( -name \*.mli.deps.byte -or -name \*.ml.deps.byte \) -delete
+	-find . \( -name \*.mli.deps -or -name \*.ml.deps \) -delete
+	-find . \( -name \*.mli.deps.byte -or -name \*.ml.deps.byte \) -delete
 
 
 ## Embedded protocol modules
diff --git a/test/Makefile.shared b/test/Makefile.shared
index 1b73ac005..8aad0b82c 100644
--- a/test/Makefile.shared
+++ b/test/Makefile.shared
@@ -79,10 +79,10 @@ ${SRCDIR}/client/%: ${CLIENTLIB}
 .PHONY: clean partial-clean
 clean:: partial-clean
 partial-clean::
-	-find \( -name \*.cm\* -or -name \*.cmp -or -name \*.out -or -name \*~ -or -name \*.o -or -name \*.a \) -delete
+	-find . \( -name \*.cm\* -or -name \*.cmp -or -name \*.out -or -name \*~ -or -name \*.o -or -name \*.a \) -delete
 
 -include .depend
-.depend: $(shell find -name \*.ml -or -name \*.ml)
+.depend: $(shell find . -name \*.ml -or -name \*.ml)
 	@echo OCAMLDEP "(test/$(notdir $(shell echo $$PWD)))"
 	@$(OCAMLDEP) -native $(INCLUDES) $^ > .depend
 
diff --git a/test/test-basic.sh b/test/test-basic.sh
index c764bf9d6..af61b24e4 100755
--- a/test/test-basic.sh
+++ b/test/test-basic.sh
@@ -5,8 +5,8 @@ set -e
 DIR=$(dirname "$0")
 cd "${DIR}"
 
-DATA_DIR="$(mktemp -td tezos_node.XXXXXXXXXX)"
-CLIENT_DIR="$(mktemp -td tezos_client.XXXXXXXXXX)"
+DATA_DIR="$(mktemp -d -t tezos_node.XXXXXXXXXX)"
+CLIENT_DIR="$(mktemp -d -t tezos_client.XXXXXXXXXX)"
 
 cleanup() {
     [ -z "${NODE_PID}" ] || kill -9 ${NODE_PID} || true