diff --git a/cli/bin/clean.sh b/cli/bin/clean.sh
deleted file mode 120000
index 04a3563c7..000000000
--- a/cli/bin/clean.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../bin/clean.sh
\ No newline at end of file
diff --git a/cli/bin/clean.sh b/cli/bin/clean.sh
new file mode 100755
index 000000000..52227c41a
--- /dev/null
+++ b/cli/bin/clean.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+CURRDIR=$(dirname "${0}")
+source ${CURRDIR}/common.sh
+source ${BUILDDIR}/../bin/clean.sh
diff --git a/cli/bin/distclean.sh b/cli/bin/distclean.sh
deleted file mode 120000
index 9c70c116d..000000000
--- a/cli/bin/distclean.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../bin/distclean.sh
\ No newline at end of file
diff --git a/cli/bin/distclean.sh b/cli/bin/distclean.sh
new file mode 100755
index 000000000..dbc2f0443
--- /dev/null
+++ b/cli/bin/distclean.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+CURRDIR=$(dirname "${0}")
+source ${CURRDIR}/common.sh
+source ${BUILDDIR}/../bin/distclean.sh
diff --git a/cli/bin/env.sh b/cli/bin/env.sh
deleted file mode 120000
index 9ffb1186f..000000000
--- a/cli/bin/env.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../bin/env.sh
\ No newline at end of file
diff --git a/cli/bin/env.sh b/cli/bin/env.sh
new file mode 100755
index 000000000..9136e46e7
--- /dev/null
+++ b/cli/bin/env.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+CURRDIR=$(dirname "${0}")
+source ${CURRDIR}/common.sh
+source ${BUILDDIR}/../bin/env.sh
diff --git a/cli/bin/packages.sh b/cli/bin/packages.sh
deleted file mode 120000
index 988a89f9c..000000000
--- a/cli/bin/packages.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../bin/packages.sh
\ No newline at end of file
diff --git a/cli/bin/packages.sh b/cli/bin/packages.sh
new file mode 100755
index 000000000..fd2ae3269
--- /dev/null
+++ b/cli/bin/packages.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+CURRDIR=$(dirname "${0}")
+source ${CURRDIR}/common.sh
+source ${BUILDDIR}/../bin/packages.sh
diff --git a/cli/bin/test.sh b/cli/bin/test.sh
deleted file mode 120000
index 8fa3014ff..000000000
--- a/cli/bin/test.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../bin/test.sh
\ No newline at end of file
diff --git a/cli/bin/test.sh b/cli/bin/test.sh
new file mode 100755
index 000000000..3c327ba4f
--- /dev/null
+++ b/cli/bin/test.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+CURRDIR=$(dirname "${0}")
+source ${CURRDIR}/common.sh
+source ${BUILDDIR}/../bin/test.sh