Fix for realpath /root returning //root. (#1451)

sbt · Aug 28, 2021 · e72f2f4 · e72f2f4
1 parent d92f682
commit e72f2f4
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/main/resources/com/typesafe/sbt/packager/archetypes/scripts/bash-template b/src/main/resources/com/typesafe/sbt/packager/archetypes/scripts/bash-template
@@ -28,16 +28,19 @@ realpath () {
 
   if [ "$TARGET_FILE" == "." -o "$TARGET_FILE" == ".." ]; then
     cd "$TARGET_FILE"
-    TARGET_FILEPATH=
+  fi
+  TARGET_DIR="$(pwd -P)"
+  if [ "$TARGET_DIR" == "/" ]; then
+    TARGET_FILE="/$TARGET_FILE"
   else
-    TARGET_FILEPATH=/$TARGET_FILE
+    TARGET_FILE="$TARGET_DIR/$TARGET_FILE"
   fi
 
   # make sure we grab the actual windows path, instead of cygwin's path.
   if [[ "x$CHECK_CYGWIN" == "x" ]]; then
-    echo "$(pwd -P)/$TARGET_FILE"
+    echo "$TARGET_FILE"
   else
-    echo $(cygwinpath "$(pwd -P)/$TARGET_FILE")
+    echo $(cygwinpath "$TARGET_FILE")
   fi
 )
 }