mirror/ripme
1
0
Fork 0
mirror of https://github.com/RipMeApp/ripme.git synced 2025-08-12 00:44:03 +02:00
Code Issues Releases Wiki Activity

Merge pull request #1283 from cyian-1756/updater-fix

Browse Source 
Updater no longer always saves the update to the users home dir on linux
This commit is contained in:
cyian-1756
2019-04-25 13:20:25 -05:00
committed by GitHub
parent af56def665 137346f4c4
commit 3ec90139bb
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/com/rarchives/ripme/ui/UpdateUtils.java
View File

@@ -2,6 +2,7 @@ package com.rarchives.ripme.ui;
import java.awt.Dimension; import java.awt.Dimension;
import java.io.*; import java.io.*;
import java.net.URISyntaxException;
import java.security.MessageDigest; import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
@@ -25,7 +26,18 @@ public class UpdateUtils {
private static final String DEFAULT_VERSION = "1.7.83"; private static final String DEFAULT_VERSION = "1.7.83";
private static final String REPO_NAME = "ripmeapp/ripme"; private static final String REPO_NAME = "ripmeapp/ripme";
private static final String updateJsonURL = "https://raw.githubusercontent.com/" + REPO_NAME + "/master/ripme.json"; private static final String updateJsonURL = "https://raw.githubusercontent.com/" + REPO_NAME + "/master/ripme.json";
private static final String mainFileName = "ripme.jar"; private static String mainFileName;
static {
try {
mainFileName = new File(UpdateUtils.class.getProtectionDomain().getCodeSource().getLocation().toURI()).getAbsolutePath();
} catch (URISyntaxException e) {
mainFileName = "ripme.jar";
logger.error("Unable to get path of jar");
e.printStackTrace();
}
}
private static final String updateFileName = "ripme.jar.update"; private static final String updateFileName = "ripme.jar.update";
private static JSONObject ripmeJson; private static JSONObject ripmeJson;
@@ -296,8 +308,10 @@ public class UpdateUtils {
// Mac / Linux // Mac / Linux
// Modifying file and launching it: *nix distributions don't have any issues with modifying/deleting files // Modifying file and launching it: *nix distributions don't have any issues with modifying/deleting files
// while they are being run // while they are being run
new File(mainFileName).delete(); File mainFile = new File(mainFileName);
new File(updateFileName).renameTo(new File(mainFileName)); String mainFilePath = mainFile.getAbsolutePath();
mainFile.delete();
new File(updateFileName).renameTo(new File(mainFilePath));
if (shouldLaunch) { if (shouldLaunch) {
// No need to do it during shutdown: the file used will indeed be the new one // No need to do it during shutdown: the file used will indeed be the new one
Runtime.getRuntime().exec("java -jar " + mainFileName); Runtime.getRuntime().exec("java -jar " + mainFileName);