The Unified and Autonomous Development Platform
Fix issue #642 - Relative directory passed to upgrade script should be calculated based on current working directory
Robin Shen725c6c74edb7
diff --git a/server-core/src/main/java/io/onedev/server/maintenance/BackupDatabase.java b/server-core/src/main/java/io/onedev/server/maintenance/BackupDatabase.javaindex 7acad68000..4be8d66f84 100644--- a/server-core/src/main/java/io/onedev/server/maintenance/BackupDatabase.java+++ b/server-core/src/main/java/io/onedev/server/maintenance/BackupDatabase.java@@ -43,8 +43,9 @@ public class BackupDatabase extends DefaultPersistManager {System.exit(1);}File backupFile = new File(Bootstrap.command.getArgs()[0]);- if (!backupFile.isAbsolute())- backupFile = new File(Bootstrap.getBinDir(), backupFile.getPath());++ if (!backupFile.isAbsolute() && System.getenv("WRAPPER_INIT_DIR") != null)+ backupFile = new File(System.getenv("WRAPPER_INIT_DIR"), backupFile.getPath());if (backupFile.exists()) {logger.error("Backup file already exists: {}", backupFile.getAbsolutePath());diff --git a/server-core/src/main/java/io/onedev/server/maintenance/RestoreDatabase.java b/server-core/src/main/java/io/onedev/server/maintenance/RestoreDatabase.javaindex 08257daf1c..e2e48c7f00 100644--- a/server-core/src/main/java/io/onedev/server/maintenance/RestoreDatabase.java+++ b/server-core/src/main/java/io/onedev/server/maintenance/RestoreDatabase.java@@ -42,9 +42,10 @@ public class RestoreDatabase extends DefaultPersistManager {logger.error("Missing backup file parameter. Usage: {} <path to database backup file>", Bootstrap.command.getScript());System.exit(1);}+File backupFile = new File(Bootstrap.command.getArgs()[0]);- if (!backupFile.isAbsolute())- backupFile = new File(Bootstrap.getBinDir(), backupFile.getPath());+ if (!backupFile.isAbsolute() && System.getenv("WRAPPER_INIT_DIR") != null)+ backupFile = new File(System.getenv("WRAPPER_INIT_DIR"), backupFile.getPath());if (!backupFile.exists()) {logger.error("Unable to find file: {}", backupFile.getAbsolutePath());diff --git a/server-core/src/main/java/io/onedev/server/maintenance/Upgrade.java b/server-core/src/main/java/io/onedev/server/maintenance/Upgrade.javaindex e26e7a4d79..aa1efde435 100644--- a/server-core/src/main/java/io/onedev/server/maintenance/Upgrade.java+++ b/server-core/src/main/java/io/onedev/server/maintenance/Upgrade.java@@ -149,9 +149,10 @@ public class Upgrade extends DefaultPersistManager {Bootstrap.command.getScript());System.exit(1);}+File upgradeDir = new File(Bootstrap.command.getArgs()[0]);- if (!upgradeDir.isAbsolute())- upgradeDir = new File(Bootstrap.getBinDir(), upgradeDir.getPath());+ if (!upgradeDir.isAbsolute() && System.getenv("WRAPPER_INIT_DIR") != null)+ upgradeDir = new File(System.getenv("WRAPPER_INIT_DIR"), upgradeDir.getPath());if (!upgradeDir.exists()) {logger.error("Unable to find directory: {}", upgradeDir.getAbsolutePath());