Use reallink for all server cli scripts

anyscale · Mar 24, 2022 · 465cac2 · 465cac2
1 parent ee0c8c4
commit 465cac2
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 4 deletions.
diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
@@ -311,13 +311,13 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
  );
  } else if (platform === 'linux' || platform === 'alpine' || platform === 'darwin') {
  result = es.merge(result,
- gulp.src('resources/server/bin/remote-cli/code.sh', { base: '.' })
+ gulp.src(`resources/server/bin/remote-cli/${platform === 'darwin' ? 'code-darwin.sh' : 'code-linux.sh'}`, { base: '.' })
  .pipe(replace('@@VERSION@@', version))
  .pipe(replace('@@COMMIT@@', commit))
  .pipe(replace('@@APPNAME@@', product.applicationName))
  .pipe(rename(`bin/remote-cli/${product.applicationName}`))
  .pipe(util.setExecutableBit()),
- gulp.src('resources/server/bin/helpers/browser.sh', { base: '.' })
+ gulp.src(`resources/server/bin/helpers/${platform === 'darwin' ? 'browser-darwin.sh' : 'browser-linux.sh'}`, { base: '.' })
  .pipe(replace('@@VERSION@@', version))
  .pipe(replace('@@COMMIT@@', commit))
  .pipe(replace('@@APPNAME@@', product.applicationName))

diff --git a/resources/server/bin/helpers/browser-darwin.sh b/resources/server/bin/helpers/browser-darwin.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env sh
+#
+# Copyright (c) Microsoft Corporation. All rights reserved.
+#
+realdir() {
+ SOURCE=$1
+ while [ -h "$SOURCE" ]; do
+ DIR=$(dirname "$SOURCE")
+ SOURCE=$(readlink "$SOURCE")
+ [[ $SOURCE != /* ]] && SOURCE=$DIR/$SOURCE
+ done
+ echo "$( cd -P "$(dirname "$SOURCE")" >/dev/null 2>&1 && pwd )"
+}
+
+ROOT=$(dirname "$(realdir "$0")")
+
+APP_NAME="@@APPNAME@@"
+VERSION="@@VERSION@@"
+COMMIT="@@COMMIT@@"
+EXEC_NAME="@@APPNAME@@"
+CLI_SCRIPT="$ROOT/out/server-cli.js"
+"$ROOT/node" "$CLI_SCRIPT" "$APP_NAME" "$VERSION" "$COMMIT" "$EXEC_NAME" "--openExternal" "$@"
diff --git a/resources/server/bin/helpers/browser.sh → ...urces/server/bin/helpers/browser-linux.sh b/resources/server/bin/helpers/browser.sh → ...urces/server/bin/helpers/browser-linux.sh
@@ -2,7 +2,7 @@
 #
 # Copyright (c) Microsoft Corporation. All rights reserved.
 #
-ROOT=$(dirname "$(dirname "$(dirname "$0")")")
+ROOT="$(dirname "$(dirname "$(readlink -f "$0")")")"
 
 APP_NAME="@@APPNAME@@"
 VERSION="@@VERSION@@"

diff --git a/resources/server/bin/remote-cli/code-darwin.sh b/resources/server/bin/remote-cli/code-darwin.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env sh
+#
+# Copyright (c) Microsoft Corporation. All rights reserved.
+#
+realdir() {
+ SOURCE=$1
+ while [ -h "$SOURCE" ]; do
+ DIR=$(dirname "$SOURCE")
+ SOURCE=$(readlink "$SOURCE")
+ [[ $SOURCE != /* ]] && SOURCE=$DIR/$SOURCE
+ done
+ echo "$( cd -P "$(dirname "$SOURCE")" >/dev/null 2>&1 && pwd )"
+}
+
+ROOT=$(dirname "$(realdir "$0")")
+
+APP_NAME="@@APPNAME@@"
+VERSION="@@VERSION@@"
+COMMIT="@@COMMIT@@"
+EXEC_NAME="@@APPNAME@@"
+CLI_SCRIPT="$ROOT/out/server-cli.js"
+"$ROOT/node" "$CLI_SCRIPT" "$APP_NAME" "$VERSION" "$COMMIT" "$EXEC_NAME" "$@"
diff --git a/resources/server/bin/remote-cli/code.sh → ...urces/server/bin/remote-cli/code-linux.sh b/resources/server/bin/remote-cli/code.sh → ...urces/server/bin/remote-cli/code-linux.sh
@@ -2,7 +2,7 @@
 #
 # Copyright (c) Microsoft Corporation. All rights reserved.
 #
-ROOT=$(dirname "$(dirname "$(dirname "$0")")")
+ROOT="$(dirname "$(dirname "$(readlink -f "$0")")")"
 
 APP_NAME="@@APPNAME@@"
 VERSION="@@VERSION@@"