Merge pull request #1106 from LukasGentele/npm-installer

installer: npx compatibility
devspace-sh · May 15, 2020 · 85e15ea · 85e15ea
2 parents f4be320 + 10c9ae8
commit 85e15ea
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/dist/npm/bin/devspace b/dist/npm/bin/devspace
@@ -1,8 +1,9 @@
 #!/usr/bin/env sh
 
 BINARY=$(command -v devspace)
+STAT=$(stat --printf="%s" "$BINARY" 2>/dev/null)
 
-if [ -f "$BINARY" ] || [ $(stat --printf="%s" "$BINARY") -lt 10000 ]; then
+if [ ! -f "$BINARY" ] || [ "$STAT" -lt 10000 ]; then
     echo "Finishing installation of DevSpace CLI"
 
     BINDIR="$(dirname $0)"
@@ -31,7 +32,7 @@ if [ -f "$BINARY" ] || [ $(stat --printf="%s" "$BINARY") -lt 10000 ]; then
     echo "Running: node $BASEDIR/$INDEX_FILE finish-install $BINDIR"
     /usr/bin/env node "$BASEDIR/$INDEX_FILE" finish-install $BINDIR;
 
-    devspace "$@" 2>/dev/null || devspace.exe "$@";
+    $BINDIR/devspace "$@" 2>/dev/null || $BINDIR/devspace.exe "$@" || devspace "$@" 2>/dev/null || devspace.exe "$@";
     exit $?;
 fi