Merge pull request #107 from madsnedergaard/mn/improve-base-dir-resolving

fix(scripts): Allow using from parent directories

Author: leonchen83

README.md

@@ -31,8 +31,7 @@ JDK 1.8 or later
 ```shell
 $ wget https://github.com/leonchen83/redis-rdb-cli/releases/latest/download/redis-rdb-cli-release.zip
 $ unzip redis-rdb-cli-release.zip
-$ cd ./redis-rdb-cli/bin
-$ ./rct -h
+$ ./redis-rdb-cli/bin/rct -h
 ```
 
 ## Compiling from Source
@@ -48,8 +47,7 @@ Maven 3.3.1 or later
 $ git clone https://github.com/leonchen83/redis-rdb-cli.git
 $ cd redis-rdb-cli
 $ mvn clean install -Dmaven.test.skip=true
-$ cd target/redis-rdb-cli-release/redis-rdb-cli/bin
-$ ./rct -h 
+$ cd ./target/redis-rdb-cli-release/redis-rdb-cli/bin/rct -h 
 ```
 
 ## Running with Docker
@@ -63,6 +61,7 @@ $ rct -V
 
 To run the commands from any directory, add the `/path/to/redis-rdb-cli/bin` directory to your system's `Path` environment variable.
 
+  
 ## Usage
 
 ### Mass Insertion

src/main/assembly/bin/rct

@@ -20,11 +20,19 @@ if [[ "$_java" ]]; then
     fi
 fi
 
-base_dir="$( cd "$( dirname "$(readlink "$0")" )" >/dev/null 2>&1 && pwd )"/..
+# Resolve script directory, handling symlinks
+SCRIPT_PATH="$0"
+while [ -L "$SCRIPT_PATH" ]; do
+    SCRIPT_PATH=$(readlink "$SCRIPT_PATH")
+    # If relative symlink, resolve relative to original dir
+    if [[ "$SCRIPT_PATH" != /* ]]; then
+        SCRIPT_PATH="$( cd "$( dirname "$0" )" >/dev/null 2>&1 && pwd )/$SCRIPT_PATH"
+    fi
+done
+SCRIPT_DIR="$( cd "$( dirname "$SCRIPT_PATH" )" >/dev/null 2>&1 && pwd )"
+base_dir="$SCRIPT_DIR/.."
 
 case "$(uname -s)" in
-  Darwin) base_dir="$( cd "$( dirname "$(readlink "$0")" )" >/dev/null 2>&1 && pwd )"/..;;
-  Linux) base_dir="$( cd "$( dirname "$(readlink -f "$0")" )" >/dev/null 2>&1 && pwd )"/..;;
   *CYGWIN*) base_dir=`cygpath -w "$base_dir"`;;
   *MSYS*) base_dir=`cygpath -w "$base_dir"`;;
 esac

src/main/assembly/bin/rct.cmd

@@ -21,7 +21,11 @@ echo NB: JAVA_HOME should point to a JDK not a JRE >&2
 goto error
 
 :chkMHome
-set "RCT_HOME=%~dp0.."
+rem Get directory of this script, then go one level up (redis-rdb-cli)
+pushd "%~dp0\.." >nul
+set "RCT_HOME=%CD%"
+popd >nul
+
 if not "%RCT_HOME%"=="" goto stripMHome
 goto error
 

src/main/assembly/bin/rcut

@@ -20,11 +20,19 @@ if [[ "$_java" ]]; then
     fi
 fi
 
-base_dir="$( cd "$( dirname "$(readlink "$0")" )" >/dev/null 2>&1 && pwd )"/..
+# Resolve script directory, handling symlinks
+SCRIPT_PATH="$0"
+while [ -L "$SCRIPT_PATH" ]; do
+    SCRIPT_PATH=$(readlink "$SCRIPT_PATH")
+    # If relative symlink, resolve relative to original dir
+    if [[ "$SCRIPT_PATH" != /* ]]; then
+        SCRIPT_PATH="$( cd "$( dirname "$0" )" >/dev/null 2>&1 && pwd )/$SCRIPT_PATH"
+    fi
+done
+SCRIPT_DIR="$( cd "$( dirname "$SCRIPT_PATH" )" >/dev/null 2>&1 && pwd )"
+base_dir="$SCRIPT_DIR/.."
 
 case "$(uname -s)" in
-  Darwin) base_dir="$( cd "$( dirname "$(readlink "$0")" )" >/dev/null 2>&1 && pwd )"/..;;
-  Linux) base_dir="$( cd "$( dirname "$(readlink -f "$0")" )" >/dev/null 2>&1 && pwd )"/..;;
   *CYGWIN*) base_dir=`cygpath -w "$base_dir"`;;
   *MSYS*) base_dir=`cygpath -w "$base_dir"`;;
 esac

src/main/assembly/bin/rdt

@@ -20,11 +20,19 @@ if [[ "$_java" ]]; then
     fi
 fi
 
-base_dir="$( cd "$( dirname "$(readlink "$0")" )" >/dev/null 2>&1 && pwd )"/..
+# Resolve script directory, handling symlinks
+SCRIPT_PATH="$0"
+while [ -L "$SCRIPT_PATH" ]; do
+    SCRIPT_PATH=$(readlink "$SCRIPT_PATH")
+    # If relative symlink, resolve relative to original dir
+    if [[ "$SCRIPT_PATH" != /* ]]; then
+        SCRIPT_PATH="$( cd "$( dirname "$0" )" >/dev/null 2>&1 && pwd )/$SCRIPT_PATH"
+    fi
+done
+SCRIPT_DIR="$( cd "$( dirname "$SCRIPT_PATH" )" >/dev/null 2>&1 && pwd )"
+base_dir="$SCRIPT_DIR/.."
 
 case "$(uname -s)" in
-  Darwin) base_dir="$( cd "$( dirname "$(readlink "$0")" )" >/dev/null 2>&1 && pwd )"/..;;
-  Linux) base_dir="$( cd "$( dirname "$(readlink -f "$0")" )" >/dev/null 2>&1 && pwd )"/..;;
   *CYGWIN*) base_dir=`cygpath -w "$base_dir"`;;
   *MSYS*) base_dir=`cygpath -w "$base_dir"`;;
 esac

src/main/assembly/bin/ret

@@ -20,11 +20,19 @@ if [[ "$_java" ]]; then
     fi
 fi
 
-base_dir="$( cd "$( dirname "$(readlink "$0")" )" >/dev/null 2>&1 && pwd )"/..
+# Resolve script directory, handling symlinks
+SCRIPT_PATH="$0"
+while [ -L "$SCRIPT_PATH" ]; do
+    SCRIPT_PATH=$(readlink "$SCRIPT_PATH")
+    # If relative symlink, resolve relative to original dir
+    if [[ "$SCRIPT_PATH" != /* ]]; then
+        SCRIPT_PATH="$( cd "$( dirname "$0" )" >/dev/null 2>&1 && pwd )/$SCRIPT_PATH"
+    fi
+done
+SCRIPT_DIR="$( cd "$( dirname "$SCRIPT_PATH" )" >/dev/null 2>&1 && pwd )"
+base_dir="$SCRIPT_DIR/.."
 
 case "$(uname -s)" in
-  Darwin) base_dir="$( cd "$( dirname "$(readlink "$0")" )" >/dev/null 2>&1 && pwd )"/..;;
-  Linux) base_dir="$( cd "$( dirname "$(readlink -f "$0")" )" >/dev/null 2>&1 && pwd )"/..;;
   *CYGWIN*) base_dir=`cygpath -w "$base_dir"`;;
   *MSYS*) base_dir=`cygpath -w "$base_dir"`;;
 esac

src/main/assembly/bin/rmonitor

@@ -20,11 +20,19 @@ if [[ "$_java" ]]; then
     fi
 fi
 
-base_dir="$( cd "$( dirname "$(readlink "$0")" )" >/dev/null 2>&1 && pwd )"/..
+# Resolve script directory, handling symlinks
+SCRIPT_PATH="$0"
+while [ -L "$SCRIPT_PATH" ]; do
+    SCRIPT_PATH=$(readlink "$SCRIPT_PATH")
+    # If relative symlink, resolve relative to original dir
+    if [[ "$SCRIPT_PATH" != /* ]]; then
+        SCRIPT_PATH="$( cd "$( dirname "$0" )" >/dev/null 2>&1 && pwd )/$SCRIPT_PATH"
+    fi
+done
+SCRIPT_DIR="$( cd "$( dirname "$SCRIPT_PATH" )" >/dev/null 2>&1 && pwd )"
+base_dir="$SCRIPT_DIR/.."
 
 case "$(uname -s)" in
-  Darwin) base_dir="$( cd "$( dirname "$(readlink "$0")" )" >/dev/null 2>&1 && pwd )"/..;;
-  Linux) base_dir="$( cd "$( dirname "$(readlink -f "$0")" )" >/dev/null 2>&1 && pwd )"/..;;
   *CYGWIN*) base_dir=`cygpath -w "$base_dir"`;;
   *MSYS*) base_dir=`cygpath -w "$base_dir"`;;
 esac

src/main/assembly/bin/rmt

@@ -20,11 +20,19 @@ if [[ "$_java" ]]; then
     fi
 fi
 
-base_dir="$( cd "$( dirname "$(readlink "$0")" )" >/dev/null 2>&1 && pwd )"/..
+# Resolve script directory, handling symlinks
+SCRIPT_PATH="$0"
+while [ -L "$SCRIPT_PATH" ]; do
+    SCRIPT_PATH=$(readlink "$SCRIPT_PATH")
+    # If relative symlink, resolve relative to original dir
+    if [[ "$SCRIPT_PATH" != /* ]]; then
+        SCRIPT_PATH="$( cd "$( dirname "$0" )" >/dev/null 2>&1 && pwd )/$SCRIPT_PATH"
+    fi
+done
+SCRIPT_DIR="$( cd "$( dirname "$SCRIPT_PATH" )" >/dev/null 2>&1 && pwd )"
+base_dir="$SCRIPT_DIR/.."
 
 case "$(uname -s)" in
-  Darwin) base_dir="$( cd "$( dirname "$(readlink "$0")" )" >/dev/null 2>&1 && pwd )"/..;;
-  Linux) base_dir="$( cd "$( dirname "$(readlink -f "$0")" )" >/dev/null 2>&1 && pwd )"/..;;
   *CYGWIN*) base_dir=`cygpath -w "$base_dir"`;;
   *MSYS*) base_dir=`cygpath -w "$base_dir"`;;
 esac

src/main/assembly/bin/rst

@@ -20,11 +20,19 @@ if [[ "$_java" ]]; then
     fi
 fi
 
-base_dir="$( cd "$( dirname "$(readlink "$0")" )" >/dev/null 2>&1 && pwd )"/..
+# Resolve script directory, handling symlinks
+SCRIPT_PATH="$0"
+while [ -L "$SCRIPT_PATH" ]; do
+    SCRIPT_PATH=$(readlink "$SCRIPT_PATH")
+    # If relative symlink, resolve relative to original dir
+    if [[ "$SCRIPT_PATH" != /* ]]; then
+        SCRIPT_PATH="$( cd "$( dirname "$0" )" >/dev/null 2>&1 && pwd )/$SCRIPT_PATH"
+    fi
+done
+SCRIPT_DIR="$( cd "$( dirname "$SCRIPT_PATH" )" >/dev/null 2>&1 && pwd )"
+base_dir="$SCRIPT_DIR/.."
 
 case "$(uname -s)" in
-  Darwin) base_dir="$( cd "$( dirname "$(readlink "$0")" )" >/dev/null 2>&1 && pwd )"/..;;
-  Linux) base_dir="$( cd "$( dirname "$(readlink -f "$0")" )" >/dev/null 2>&1 && pwd )"/..;;
   *CYGWIN*) base_dir=`cygpath -w "$base_dir"`;;
   *MSYS*) base_dir=`cygpath -w "$base_dir"`;;
 esac