fix some bugs & chmod

fix java download
2025-06-09 10:34:18 +00:00 · 2025-02-21 18:26:36 +01:00 · 2024-12-18 22:33:05 +01:00
149 changed files with 222 additions and 176 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
--- a/.gitignore
+++ b/.gitignore
--- a/package.json
+++ b/package.json
--- a/packages/cli/bin
+++ b/packages/cli/bin
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
--- a/packages/cli/src/index.js
+++ b/packages/cli/src/index.js
--- a/packages/core/.swcrc
+++ b/packages/core/.swcrc
--- a/packages/core/package.json
+++ b/packages/core/package.json
@ -1,6 +1,6 @@
 {
 	"name": "@ragestudio/relic-core",
-  "version": "0.20.2",
+	"version": "0.20.3",
 	"license": "MIT",
 	"author": "RageStudio",
 	"description": "RageStudio Relic, yet another package manager.",
--- a/packages/core/src/classes/ManifestAuthDB.js
+++ b/packages/core/src/classes/ManifestAuthDB.js
--- a/packages/core/src/classes/ManifestConfig.js
+++ b/packages/core/src/classes/ManifestConfig.js
--- a/packages/core/src/classes/PatchManager.js
+++ b/packages/core/src/classes/PatchManager.js
--- a/packages/core/src/classes/Settings.js
+++ b/packages/core/src/classes/Settings.js
--- a/packages/core/src/db.js
+++ b/packages/core/src/db.js
--- a/packages/core/src/generic_steps/git_clone.js
+++ b/packages/core/src/generic_steps/git_clone.js
--- a/packages/core/src/generic_steps/git_pull.js
+++ b/packages/core/src/generic_steps/git_pull.js
--- a/packages/core/src/generic_steps/git_reset.js
+++ b/packages/core/src/generic_steps/git_reset.js
--- a/packages/core/src/generic_steps/http.js
+++ b/packages/core/src/generic_steps/http.js
--- a/packages/core/src/generic_steps/index.js
+++ b/packages/core/src/generic_steps/index.js
--- a/packages/core/src/generic_steps/torrent.js
+++ b/packages/core/src/generic_steps/torrent.js
--- a/packages/core/src/handlers/apply.js
+++ b/packages/core/src/handlers/apply.js
--- a/packages/core/src/handlers/authorize.js
+++ b/packages/core/src/handlers/authorize.js
--- a/packages/core/src/handlers/cancelInstall.js
+++ b/packages/core/src/handlers/cancelInstall.js
--- a/packages/core/src/handlers/checkUpdate.js
+++ b/packages/core/src/handlers/checkUpdate.js
--- a/packages/core/src/handlers/deauthorize.js
+++ b/packages/core/src/handlers/deauthorize.js
--- a/packages/core/src/handlers/execute.js
+++ b/packages/core/src/handlers/execute.js
--- a/packages/core/src/handlers/install.js
+++ b/packages/core/src/handlers/install.js
--- a/packages/core/src/handlers/lastOperationRetry.js
+++ b/packages/core/src/handlers/lastOperationRetry.js
--- a/packages/core/src/handlers/list.js
+++ b/packages/core/src/handlers/list.js
--- a/packages/core/src/handlers/read.js
+++ b/packages/core/src/handlers/read.js
--- a/packages/core/src/handlers/reinstall.js
+++ b/packages/core/src/handlers/reinstall.js
--- a/packages/core/src/handlers/uninstall.js
+++ b/packages/core/src/handlers/uninstall.js
--- a/packages/core/src/handlers/update.js
+++ b/packages/core/src/handlers/update.js
--- a/packages/core/src/helpers/downloadHttpFile.js
+++ b/packages/core/src/helpers/downloadHttpFile.js
--- a/packages/core/src/helpers/downloadTorrent.js
+++ b/packages/core/src/helpers/downloadTorrent.js
--- a/packages/core/src/helpers/sendToRender.js
+++ b/packages/core/src/helpers/sendToRender.js
--- a/packages/core/src/helpers/setup.js
+++ b/packages/core/src/helpers/setup.js
--- a/packages/core/src/index.js
+++ b/packages/core/src/index.js
@ -30,7 +30,7 @@ export default class RelicCore {
 		this.params = params
 	}

-    eventBus = global._relic_eventBus = new EventEmitter()
+	eventBus = (global._relic_eventBus = new EventEmitter())

 	logger = Logger

@ -42,21 +42,32 @@ export default class RelicCore {
 			vars: Vars,
 		}

+		console.log(`Checking runtime_path >`, Vars.runtime_path)
+
+		if (!fs.existsSync(Vars.runtime_path)) {
+			fs.mkdirSync(Vars.runtime_path, { recursive: true })
+		}
+
 		await DB.initialize()

 		await Settings.initialize()

-        if (!await Settings.get("packages_path")) {
+		if (!(await Settings.get("packages_path"))) {
 			await Settings.set("packages_path", Vars.packages_path)
 		}

 		this.aria2c_instance = execa(
 			Vars.aria2_bin,
-            ["--enable-rpc", "--rpc-listen-all=true", "--rpc-allow-origin-all", "--file-allocation=none"],
+			[
+				"--enable-rpc",
+				"--rpc-listen-all=true",
+				"--rpc-allow-origin-all",
+				"--file-allocation=none",
+			],
 			{
 				stdout: "inherit",
 				stderr: "inherit",
-            }
+			},
 		)

 		onExit(this.onExit)
@ -97,7 +108,8 @@ export default class RelicCore {
 			return open(Vars.runtime_path)
 		}

-        const packagesPath = await Settings.get("packages_path") ?? Vars.packages_path
+		const packagesPath =
+			(await Settings.get("packages_path")) ?? Vars.packages_path

 		return open(packagesPath + "/" + pkg_id)
 	}
--- a/packages/core/src/libraries/execa/index.js
+++ b/packages/core/src/libraries/execa/index.js
--- a/packages/core/src/libraries/execa/lib/command.js
+++ b/packages/core/src/libraries/execa/lib/command.js
--- a/packages/core/src/libraries/execa/lib/error.js
+++ b/packages/core/src/libraries/execa/lib/error.js
--- a/packages/core/src/libraries/execa/lib/kill.js
+++ b/packages/core/src/libraries/execa/lib/kill.js
--- a/packages/core/src/libraries/execa/lib/pipe.js
+++ b/packages/core/src/libraries/execa/lib/pipe.js
--- a/packages/core/src/libraries/execa/lib/promise.js
+++ b/packages/core/src/libraries/execa/lib/promise.js
--- a/packages/core/src/libraries/execa/lib/stdio.js
+++ b/packages/core/src/libraries/execa/lib/stdio.js
--- a/packages/core/src/libraries/execa/lib/stream.js
+++ b/packages/core/src/libraries/execa/lib/stream.js
--- a/packages/core/src/libraries/execa/lib/verbose.js
+++ b/packages/core/src/libraries/execa/lib/verbose.js
--- a/packages/core/src/libraries/get-stream/array-buffer.js
+++ b/packages/core/src/libraries/get-stream/array-buffer.js
--- a/packages/core/src/libraries/get-stream/array.js
+++ b/packages/core/src/libraries/get-stream/array.js
--- a/packages/core/src/libraries/get-stream/buffer.js
+++ b/packages/core/src/libraries/get-stream/buffer.js
--- a/packages/core/src/libraries/get-stream/contents.js
+++ b/packages/core/src/libraries/get-stream/contents.js
--- a/packages/core/src/libraries/get-stream/index.js
+++ b/packages/core/src/libraries/get-stream/index.js
--- a/packages/core/src/libraries/get-stream/string.js
+++ b/packages/core/src/libraries/get-stream/string.js
--- a/packages/core/src/libraries/get-stream/utils.js
+++ b/packages/core/src/libraries/get-stream/utils.js
--- a/packages/core/src/libraries/human-signals/core.js
+++ b/packages/core/src/libraries/human-signals/core.js
--- a/packages/core/src/libraries/human-signals/index.js
+++ b/packages/core/src/libraries/human-signals/index.js
--- a/packages/core/src/libraries/human-signals/realtime.js
+++ b/packages/core/src/libraries/human-signals/realtime.js
--- a/packages/core/src/libraries/human-signals/signals.js
+++ b/packages/core/src/libraries/human-signals/signals.js
--- a/packages/core/src/libraries/is-stream/index.js
+++ b/packages/core/src/libraries/is-stream/index.js
--- a/packages/core/src/libraries/lowdb/adapters/Memory.js
+++ b/packages/core/src/libraries/lowdb/adapters/Memory.js
--- a/packages/core/src/libraries/lowdb/adapters/node/DataFile.js
+++ b/packages/core/src/libraries/lowdb/adapters/node/DataFile.js
--- a/packages/core/src/libraries/lowdb/adapters/node/JSONFile.js
+++ b/packages/core/src/libraries/lowdb/adapters/node/JSONFile.js
--- a/packages/core/src/libraries/lowdb/adapters/node/TextFile.js
+++ b/packages/core/src/libraries/lowdb/adapters/node/TextFile.js
--- a/packages/core/src/libraries/lowdb/core/Low.js
+++ b/packages/core/src/libraries/lowdb/core/Low.js
--- a/packages/core/src/libraries/lowdb/presets/node.js
+++ b/packages/core/src/libraries/lowdb/presets/node.js
--- a/packages/core/src/libraries/lowdb/steno/index.js
+++ b/packages/core/src/libraries/lowdb/steno/index.js
--- a/packages/core/src/libraries/mimic-function/index.js
+++ b/packages/core/src/libraries/mimic-function/index.js
--- a/packages/core/src/libraries/npm-run-path/index.js
+++ b/packages/core/src/libraries/npm-run-path/index.js
--- a/packages/core/src/libraries/onetime/index.js
+++ b/packages/core/src/libraries/onetime/index.js
--- a/packages/core/src/libraries/strip-final-newline/index.js
+++ b/packages/core/src/libraries/strip-final-newline/index.js
--- a/packages/core/src/logger.js
+++ b/packages/core/src/logger.js
--- a/packages/core/src/manifest/libraries.js
+++ b/packages/core/src/manifest/libraries.js
--- a/packages/core/src/manifest/libs/auth/index.js
+++ b/packages/core/src/manifest/libs/auth/index.js
--- a/packages/core/src/manifest/libs/extract/index.js
+++ b/packages/core/src/manifest/libs/extract/index.js
--- a/packages/core/src/manifest/libs/fs/index.js
+++ b/packages/core/src/manifest/libs/fs/index.js
--- a/packages/core/src/manifest/libs/index.js
+++ b/packages/core/src/manifest/libs/index.js
--- a/packages/core/src/manifest/libs/mcl/authenticator.js
+++ b/packages/core/src/manifest/libs/mcl/authenticator.js
--- a/packages/core/src/manifest/libs/mcl/handler.js
+++ b/packages/core/src/manifest/libs/mcl/handler.js
--- a/packages/core/src/manifest/libs/mcl/index.js
+++ b/packages/core/src/manifest/libs/mcl/index.js
--- a/packages/core/src/manifest/libs/mcl/launcher.js
+++ b/packages/core/src/manifest/libs/mcl/launcher.js
--- a/packages/core/src/manifest/libs/open/index.js
+++ b/packages/core/src/manifest/libs/open/index.js
--- a/packages/core/src/manifest/libs/path/index.js
+++ b/packages/core/src/manifest/libs/path/index.js
--- a/packages/core/src/manifest/reader.js
+++ b/packages/core/src/manifest/reader.js
--- a/packages/core/src/manifest/vm.js
+++ b/packages/core/src/manifest/vm.js
--- a/packages/core/src/prerequisites.js
+++ b/packages/core/src/prerequisites.js
@ -44,7 +44,7 @@ export default [
                params: {
                    arch: arch,
                    java_version: "22",
-                    os: os,
+                    os: os === "win32" ? "windows" : os,
                    archive_type: "zip",
                    javafx_bundled: "false",
                    java_package_type: "jre",
@ -78,7 +78,7 @@ export default [
                params: {
                    arch: arch,
                    java_version: "17",
-                    os: os,
+                    os: os === "win32" ? "windows" : os,
                    archive_type: "zip",
                    javafx_bundled: "false",
                    java_package_type: "jre",
--- a/packages/core/src/utils/chmodRecursive.js
+++ b/packages/core/src/utils/chmodRecursive.js
--- a/packages/core/src/utils/extractFile.js
+++ b/packages/core/src/utils/extractFile.js
--- a/packages/core/src/utils/parseStringVars.js
+++ b/packages/core/src/utils/parseStringVars.js
--- a/packages/core/src/utils/readDirRecurse.js
+++ b/packages/core/src/utils/readDirRecurse.js
--- a/packages/core/src/utils/resolveOs.js
+++ b/packages/core/src/utils/resolveOs.js
--- a/packages/core/src/utils/resolveRemoteBinPath.js
+++ b/packages/core/src/utils/resolveRemoteBinPath.js
--- a/packages/core/src/utils/resolveUserDataPath.js
+++ b/packages/core/src/utils/resolveUserDataPath.js
--- a/packages/core/src/vars.js
+++ b/packages/core/src/vars.js
@ -11,15 +11,48 @@ const userdata_path = resolveUserDataPath()
 const runtime_path = upath.normalizeSafe(path.join(userdata_path, runtimeName))
 const cache_path = upath.normalizeSafe(path.join(runtime_path, "cache"))
 const packages_path = upath.normalizeSafe(path.join(runtime_path, "packages"))
-const binaries_path = upath.normalizeSafe(path.resolve(runtime_path, "binaries"))
+const binaries_path = upath.normalizeSafe(
+	path.resolve(runtime_path, "binaries"),
+)
 const db_path = upath.normalizeSafe(path.resolve(runtime_path, "db.json"))

 const binaries = {
-    sevenzip_bin: upath.normalizeSafe(path.resolve(binaries_path, "7z-bin", isWin ? "7za.exe" : "7zz")),
-    git_bin: upath.normalizeSafe(path.resolve(binaries_path, "git-bin", "bin", isWin ? "git.exe" : "git")),
-    aria2_bin: upath.normalizeSafe(path.resolve(binaries_path, "aria2", isWin ? "aria2c.exe" : "aria2c")),
-    java22_jre_bin: upath.normalizeSafe(path.resolve(binaries_path, "java22_jre_bin", (isMac ? "Contents/Home/bin/java" : (isWin ? "bin/java.exe" : "bin/java")))),
-    java17_jre_bin: upath.normalizeSafe(path.resolve(binaries_path, "java17_jre_bin", (isMac ? "Contents/Home/bin/java" : (isWin ? "bin/java.exe" : "bin/java")))),
+	sevenzip_bin: upath.normalizeSafe(
+		path.resolve(binaries_path, "7z-bin", isWin ? "7za.exe" : "7z"),
+	),
+	git_bin: upath.normalizeSafe(
+		path.resolve(
+			binaries_path,
+			"git-bin",
+			"bin",
+			isWin ? "git.exe" : "git",
+		),
+	),
+	aria2_bin: upath.normalizeSafe(
+		path.resolve(binaries_path, "aria2", isWin ? "aria2c.exe" : "aria2c"),
+	),
+	java22_jre_bin: upath.normalizeSafe(
+		path.resolve(
+			binaries_path,
+			"java22_jre_bin",
+			isMac
+				? "Contents/Home/bin/java"
+				: isWin
+					? "bin/java.exe"
+					: "bin/java",
+		),
+	),
+	java17_jre_bin: upath.normalizeSafe(
+		path.resolve(
+			binaries_path,
+			"java17_jre_bin",
+			isMac
+				? "Contents/Home/bin/java"
+				: isWin
+					? "bin/java.exe"
+					: "bin/java",
+		),
+	),
 }

 export default {
--- a/packages/gui/electron-builder.yml
+++ b/packages/gui/electron-builder.yml
@ -26,10 +26,10 @@ dmg:
 linux:
  target:
    - AppImage
-    - snap
    - deb
-  maintainer: electronjs.org
+  maintainer: ragestudio.net
  category: Utility
+  icon: resources/icon.png
 appImage:
  artifactName: ${productName}-${version}.${ext}
 npmRebuild: false
--- a/packages/gui/electron.vite.config.js
+++ b/packages/gui/electron.vite.config.js
--- a/packages/gui/package.json
+++ b/packages/gui/package.json
@ -1,7 +1,8 @@
 {
-  "name": "@ragestudio/relic-gui",
-  "version": "0.20.2",
+	"name": "relic-gui",
+	"version": "0.20.3",
 	"description": "RageStudio Relic, yet another package manager.",
+	"homepage": "https://relic.ragestudio.net",
 	"main": "./out/main/index.js",
 	"author": "RageStudio",
 	"license": "MIT",
@ -24,7 +25,7 @@
 		"@getstation/electron-google-oauth2": "^14.0.0",
 		"@imjs/electron-differential-updater": "^5.1.7",
 		"@loadable/component": "^5.16.3",
-    "@ragestudio/relic-core": "^0.20.2",
+		"@ragestudio/relic-core": "^0.20.3",
 		"antd": "^5.13.2",
 		"classnames": "^2.3.2",
 		"electron-differential-updater": "^4.3.2",
--- a/packages/gui/resources/icon.ico
+++ b/packages/gui/resources/icon.ico
--- a/packages/gui/resources/icon.png
+++ b/packages/gui/resources/icon.png
--- a/packages/gui/resources/icon.svg
+++ b/packages/gui/resources/icon.svg
--- a/packages/gui/src/main/classes/CoreAdapter.js
+++ b/packages/gui/src/main/classes/CoreAdapter.js
--- a/packages/gui/src/main/index.js
+++ b/packages/gui/src/main/index.js
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
srgooglo	0e3889220d	fix some bugs & chmod	2025-02-21 18:26:36 +01:00
SrGooglo	c996b215a3	fix java download	2024-12-18 22:33:05 +01:00