doing a pass on the script and wrappers that they do not polute the path with pharo but pharoForPillar

Author: Ducasse

scripts/build.sh

@@ -33,16 +33,20 @@ PHARO_VERSION="${PHARO_VERSION:-130}"
 
 rm -rf "${__builddir}" && mkdir -p "${__builddir}" && cd "${__builddir}"
 
-if command -v pharo >/dev/null 2>&1; then
-  echo "pharo is in PATH"
-  PHARO_VM_BIN="pharo"
-  wget -O - get.pharo.org/64/${PHARO_VERSION} | bash
-else
-  echo "pharo not found in PATH"
-  wget -O - get.pharo.org/64/${PHARO_VERSION}+vm | bash
-  PHARO_VM_BIN="./pharo"
-fi
+#if command -v pharo >/dev/null 2>&1; then
+#  echo "pharo is in PATH"
+#  PHARO_VM_BIN="pharo"
+#  wget -O - get.pharo.org/64/${PHARO_VERSION} | bash
+#else
+#  echo "pharo not found in PATH"
+#  wget -O - get.pharo.org/64/${PHARO_VERSION}+vm | bash
+#  PHARO_VM_BIN="./pharo"
+#fi
 
+wget -O - get.pharo.org/64/${PHARO_VERSION}+vm | bash
+mv ./pharo ./pharoForPillar
+mv ./pharo-ui ./pharoForPillar-ui
+PHARO_VM_BIN="./pharoForPillar"
 PHARO="$PHARO_VM_BIN Pharo.image --no-default-preferences"
 
 REPOSITORY_PATH=${__dir}/../src

scripts/wrappers/mustache

@@ -7,7 +7,7 @@ set -o nounset
 
 __dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
-PHARO_VM="${__dir}/pharo"
+PHARO_VM="${__dir}/pharoForPillar"
 PILLAR_IMAGE="${__dir}/Pharo.image"
 
 #Read pillar command

scripts/wrappers/pillar

@@ -11,7 +11,7 @@ set -o nounset
 __dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 
-PHARO_VM="${__dir}/pharo"
+PHARO_VM="${__dir}/pharoForPillar"
 PILLAR_IMAGE="${__dir}/Pharo.image"
 
 # disable parameter expansion to forward all arguments unprocessed to the VM

scripts/wrappers/pillar-db

@@ -7,7 +7,7 @@ set -o nounset
 
 __dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
-PHARO_VM="${__dir}/pharo-ui"
+PHARO_VM="${__dir}/pharoForPillar-ui"
 PILLAR_IMAGE="${__dir}/Pharo.image"
 
 # disable parameter expansion to forward all arguments unprocessed to the VM