fix: issue with restore.sh

Fixed issue #1384
ArcadeData · Dec 17, 2023 · 568175f · 568175f
1 parent 9ddcc86
commit 568175f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/console/src/main/java/com/arcadedb/console/Console.java b/console/src/main/java/com/arcadedb/console/Console.java
@@ -140,6 +140,10 @@ public void interactiveMode() throws IOException {
   }
 
   public static void main(final String[] args) throws IOException {
+    final String rootPath = GlobalConfiguration.SERVER_ROOT_PATH.getValueAsString();
+    if (rootPath == null)
+      GlobalConfiguration.SERVER_ROOT_PATH.setValue(".");
+
     try {
       execute(args);
     } finally {

diff --git a/integration/src/main/java/com/arcadedb/integration/restore/Restore.java b/integration/src/main/java/com/arcadedb/integration/restore/Restore.java
@@ -18,6 +18,7 @@
  */
 package com.arcadedb.integration.restore;
 
+import com.arcadedb.GlobalConfiguration;
 import com.arcadedb.database.DatabaseInternal;
 import com.arcadedb.integration.importer.ConsoleLogger;
 import com.arcadedb.integration.restore.format.AbstractRestoreFormat;
@@ -42,6 +43,10 @@ public Restore(final String file, final String databaseURL) {
   }
 
   public static void main(final String[] args) {
+    final String rootPath = GlobalConfiguration.SERVER_ROOT_PATH.getValueAsString();
+    if (rootPath == null)
+      GlobalConfiguration.SERVER_ROOT_PATH.setValue(".");
+
     new Restore(args).restoreDatabase();
     System.exit(0);
   }

diff --git a/integration/src/main/java/com/arcadedb/integration/restore/format/FullRestoreFormat.java b/integration/src/main/java/com/arcadedb/integration/restore/format/FullRestoreFormat.java
@@ -137,7 +137,8 @@ private RestoreInputSource openInputFile() throws IOException {
 
     final File file = new File(path);
     if (!file.exists())
-      throw new RestoreException(String.format("The backup file '%s' does not exist", settings.inputFileURL));
+      throw new RestoreException(String.format("The backup file '%s' does not exist (local path=%s)",//
+          settings.inputFileURL, new File(".").getAbsolutePath()));
 
     return new RestoreInputSource(new FileInputStream(file), file.length());
   }

diff --git a/package/src/main/scripts/restore.sh b/package/src/main/scripts/restore.sh
@@ -34,9 +34,6 @@ PRGDIR=`dirname "$PRG"`
 # Only set ARCADEDB_HOME if not already set
 [ -f "$ARCADEDB_HOME"/bin/console.sh ] || ARCADEDB_HOME=`cd "$PRGDIR/.." ; pwd`
 
-cd "$ARCADEDB_HOME/bin"
-
-
 # Raspberry Pi check (Java VM does not run with -server argument on ARMv6)
 if [ `uname -m` != "armv6l" ]; then
   JAVA_OPTS="$JAVA_OPTS -server "
@@ -49,7 +46,6 @@ else
    JAVA=java
 fi
 
-
 if [ -z "$JAVA_OPTS_SCRIPT" ] ; then
     JAVA_OPTS_SCRIPT="-XX:+HeapDumpOnOutOfMemoryError -Djava.awt.headless=true -Dfile.encoding=UTF8 -Dpolyglot.engine.WarnInterpreterOnly=false"
 fi