fix some bugs & chmod

packages/core/package.json

@@ -1,45 +1,45 @@
 {
-  "name": "@ragestudio/relic-core",
+	"name": "@ragestudio/relic-core",
-  "version": "0.20.2",
+	"version": "0.20.3",
-  "license": "MIT",
+	"license": "MIT",
-  "author": "RageStudio",
+	"author": "RageStudio",
-  "description": "RageStudio Relic, yet another package manager.",
+	"description": "RageStudio Relic, yet another package manager.",
-  "main": "./dist/index.js",
+	"main": "./dist/index.js",
-  "files": [
+	"files": [
-    "dist",
+		"dist",
-    "src"
+		"src"
-  ],
+	],
-  "scripts": {
+	"scripts": {
-    "build": "hermes build",
+		"build": "hermes build",
-    "build:swc": "npx swc ./src --out-dir ./dist --strip-leading-paths"
+		"build:swc": "npx swc ./src --out-dir ./dist --strip-leading-paths"
-  },
+	},
-  "dependencies": {
+	"dependencies": {
-    "@foxify/events": "^2.1.0",
+		"@foxify/events": "^2.1.0",
-    "adm-zip": "^0.5.12",
+		"adm-zip": "^0.5.12",
-    "aria2": "^4.1.2",
+		"aria2": "^4.1.2",
-    "axios": "^1.6.8",
+		"axios": "^1.6.8",
-    "checksum": "^1.0.0",
+		"checksum": "^1.0.0",
-    "cli-color": "^2.0.4",
+		"cli-color": "^2.0.4",
-    "cli-progress": "^3.12.0",
+		"cli-progress": "^3.12.0",
-    "deep-object-diff": "^1.1.9",
+		"deep-object-diff": "^1.1.9",
-    "extends-classes": "^1.0.5",
+		"extends-classes": "^1.0.5",
-    "googleapis": "^134.0.0",
+		"googleapis": "^134.0.0",
-    "human-format": "^1.2.0",
+		"human-format": "^1.2.0",
-    "merge-stream": "^2.0.0",
+		"merge-stream": "^2.0.0",
-    "module-alias": "^2.2.3",
+		"module-alias": "^2.2.3",
-    "node-7z": "^3.0.0",
+		"node-7z": "^3.0.0",
-    "open": "8.4.2",
+		"open": "8.4.2",
-    "request": "^2.88.2",
+		"request": "^2.88.2",
-    "rimraf": "^5.0.5",
+		"rimraf": "^5.0.5",
-    "signal-exit": "^4.1.0",
+		"signal-exit": "^4.1.0",
-    "unzipper": "^0.10.14",
+		"unzipper": "^0.10.14",
-    "upath": "^2.0.1",
+		"upath": "^2.0.1",
-    "uuid": "^9.0.1",
+		"uuid": "^9.0.1",
-    "webtorrent": "^2.4.1",
+		"webtorrent": "^2.4.1",
-    "winston": "^3.13.0"
+		"winston": "^3.13.0"
-  },
+	},
-  "devDependencies": {
+	"devDependencies": {
-    "@swc/cli": "^0.3.12",
+		"@swc/cli": "^0.3.12",
-    "@swc/core": "^1.4.11"
+		"@swc/core": "^1.4.11"
-  }
+	}
 }

packages/core/src/index.js

@@ -26,79 +26,91 @@ import PackageCheckUpdate from "./handlers/checkUpdate"
 import PackageLastOperationRetry from "./handlers/lastOperationRetry"
 
 export default class RelicCore {
-    constructor(params) {
+	constructor(params) {
-        this.params = params
+		this.params = params
-    }
+	}
 
-    eventBus = global._relic_eventBus = new EventEmitter()
+	eventBus = (global._relic_eventBus = new EventEmitter())
 
-    logger = Logger
+	logger = Logger
 
-    db = DB
+	db = DB
 
-    async initialize() {
+	async initialize() {
-        globalThis.relic_core = {
+		globalThis.relic_core = {
-            tasks: [],
+			tasks: [],
-            vars: Vars,
+			vars: Vars,
-        }
+		}
 
-        await DB.initialize()
+		console.log(`Checking runtime_path >`, Vars.runtime_path)
 
-        await Settings.initialize()
+		if (!fs.existsSync(Vars.runtime_path)) {
+			fs.mkdirSync(Vars.runtime_path, { recursive: true })
+		}
 
-        if (!await Settings.get("packages_path")) {
+		await DB.initialize()
-            await Settings.set("packages_path", Vars.packages_path)
-        }
 
-        this.aria2c_instance = execa(
+		await Settings.initialize()
-            Vars.aria2_bin,
-            ["--enable-rpc", "--rpc-listen-all=true", "--rpc-allow-origin-all", "--file-allocation=none"],
-            {
-                stdout: "inherit",
-                stderr: "inherit",
-            }
-        )
 
-        onExit(this.onExit)
+		if (!(await Settings.get("packages_path"))) {
-    }
+			await Settings.set("packages_path", Vars.packages_path)
+		}
 
-    onExit = () => {
+		this.aria2c_instance = execa(
-        if (fs.existsSync(Vars.cache_path)) {
+			Vars.aria2_bin,
-            fs.rmSync(Vars.cache_path, { recursive: true, force: true })
+			[
-        }
+				"--enable-rpc",
+				"--rpc-listen-all=true",
+				"--rpc-allow-origin-all",
+				"--file-allocation=none",
+			],
+			{
+				stdout: "inherit",
+				stderr: "inherit",
+			},
+		)
 
-        if (this.aria2c_instance) {
+		onExit(this.onExit)
-            this.aria2c_instance.kill("SIGINT")
+	}
-        }
-    }
 
-    async setup() {
+	onExit = () => {
-        return await SetupHelper()
+		if (fs.existsSync(Vars.cache_path)) {
-    }
+			fs.rmSync(Vars.cache_path, { recursive: true, force: true })
+		}
 
-    package = {
+		if (this.aria2c_instance) {
-        install: PackageInstall,
+			this.aria2c_instance.kill("SIGINT")
-        execute: PackageExecute,
+		}
-        uninstall: PackageUninstall,
+	}
-        reinstall: PackageReinstall,
-        cancelInstall: PackageCancelInstall,
-        update: PackageUpdate,
-        apply: PackageApply,
-        list: PackageList,
-        read: PackageRead,
-        authorize: PackageAuthorize,
-        deauthorize: PackageDeauthorize,
-        checkUpdate: PackageCheckUpdate,
-        lastOperationRetry: PackageLastOperationRetry,
-    }
 
-    async openPath(pkg_id) {
+	async setup() {
-        if (!pkg_id) {
+		return await SetupHelper()
-            return open(Vars.runtime_path)
+	}
-        }
 
-        const packagesPath = await Settings.get("packages_path") ?? Vars.packages_path
+	package = {
+		install: PackageInstall,
+		execute: PackageExecute,
+		uninstall: PackageUninstall,
+		reinstall: PackageReinstall,
+		cancelInstall: PackageCancelInstall,
+		update: PackageUpdate,
+		apply: PackageApply,
+		list: PackageList,
+		read: PackageRead,
+		authorize: PackageAuthorize,
+		deauthorize: PackageDeauthorize,
+		checkUpdate: PackageCheckUpdate,
+		lastOperationRetry: PackageLastOperationRetry,
+	}
 
-        return open(packagesPath + "/" + pkg_id)
+	async openPath(pkg_id) {
-    }
+		if (!pkg_id) {
+			return open(Vars.runtime_path)
+		}
+
+		const packagesPath =
+			(await Settings.get("packages_path")) ?? Vars.packages_path
+
+		return open(packagesPath + "/" + pkg_id)
+	}
 }

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",

packages/core/src/vars.js

@@ -11,24 +11,57 @@ 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")),
+	sevenzip_bin: upath.normalizeSafe(
-    git_bin: upath.normalizeSafe(path.resolve(binaries_path, "git-bin", "bin", isWin ? "git.exe" : "git")),
+		path.resolve(binaries_path, "7z-bin", isWin ? "7za.exe" : "7z"),
-    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")))),
+	git_bin: upath.normalizeSafe(
-    java17_jre_bin: upath.normalizeSafe(path.resolve(binaries_path, "java17_jre_bin", (isMac ? "Contents/Home/bin/java" : (isWin ? "bin/java.exe" : "bin/java")))),
+		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 {
-    runtimeName,
+	runtimeName,
-    db_path,
+	db_path,
-    userdata_path,
+	userdata_path,
-    runtime_path,
+	runtime_path,
-    cache_path,
+	cache_path,
-    packages_path,
+	packages_path,
-    binaries_path,
+	binaries_path,
-    ...binaries,
+	...binaries,
 }

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

packages/gui/package.json

@@ -1,55 +1,56 @@
 {
-  "name": "@ragestudio/relic-gui",
+	"name": "relic-gui",
-  "version": "0.20.2",
+	"version": "0.20.3",
-  "description": "RageStudio Relic, yet another package manager.",
+	"description": "RageStudio Relic, yet another package manager.",
-  "main": "./out/main/index.js",
+	"homepage": "https://relic.ragestudio.net",
-  "author": "RageStudio",
+	"main": "./out/main/index.js",
-  "license": "MIT",
+	"author": "RageStudio",
-  "scripts": {
+	"license": "MIT",
-    "start": "electron-vite preview",
+	"scripts": {
-    "dev": "npm run build:core && electron-vite dev",
+		"start": "electron-vite preview",
-    "build": "npm run build:core && electron-vite build",
+		"dev": "npm run build:core && electron-vite dev",
-    "postinstall": "electron-builder install-app-deps",
+		"build": "npm run build:core && electron-vite build",
-    "pack:win": "electron-builder --win --config",
+		"postinstall": "electron-builder install-app-deps",
-    "pack:mac": "electron-builder --mac --config",
+		"pack:win": "electron-builder --win --config",
-    "pack:linux": "electron-builder --linux --config",
+		"pack:mac": "electron-builder --mac --config",
-    "build:win": "npm run build && npm run pack:win",
+		"pack:linux": "electron-builder --linux --config",
-    "build:mac": "npm run build && npm run pack:mac",
+		"build:win": "npm run build && npm run pack:win",
-    "build:linux": "npm run build && npm run pack:linux",
+		"build:mac": "npm run build && npm run pack:mac",
-    "build:core": "cd ../core && npm run build:swc"
+		"build:linux": "npm run build && npm run pack:linux",
-  },
+		"build:core": "cd ../core && npm run build:swc"
-  "dependencies": {
+	},
-    "@electron-toolkit/preload": "^2.0.0",
+	"dependencies": {
-    "@electron-toolkit/utils": "^2.0.0",
+		"@electron-toolkit/preload": "^2.0.0",
-    "@getstation/electron-google-oauth2": "^14.0.0",
+		"@electron-toolkit/utils": "^2.0.0",
-    "@imjs/electron-differential-updater": "^5.1.7",
+		"@getstation/electron-google-oauth2": "^14.0.0",
-    "@loadable/component": "^5.16.3",
+		"@imjs/electron-differential-updater": "^5.1.7",
-    "@ragestudio/relic-core": "^0.20.2",
+		"@loadable/component": "^5.16.3",
-    "antd": "^5.13.2",
+		"@ragestudio/relic-core": "^0.20.3",
-    "classnames": "^2.3.2",
+		"antd": "^5.13.2",
-    "electron-differential-updater": "^4.3.2",
+		"classnames": "^2.3.2",
-    "electron-is-dev": "^2.0.0",
+		"electron-differential-updater": "^4.3.2",
-    "electron-store": "^8.1.0",
+		"electron-is-dev": "^2.0.0",
-    "electron-updater": "^6.1.1",
+		"electron-store": "^8.1.0",
-    "got": "11.8.3",
+		"electron-updater": "^6.1.1",
-    "human-format": "^1.2.0",
+		"got": "11.8.3",
-    "protocol-registry": "^1.4.1",
+		"human-format": "^1.2.0",
-    "less": "^4.2.0",
+		"protocol-registry": "^1.4.1",
-    "lodash": "^4.17.21",
+		"less": "^4.2.0",
-    "react-icons": "^4.11.0",
+		"lodash": "^4.17.21",
-    "react-motion": "0.5.2",
+		"react-icons": "^4.11.0",
-    "react-router-dom": "6.6.2",
+		"react-motion": "0.5.2",
-    "react-spinners": "^0.13.8",
+		"react-router-dom": "6.6.2",
-    "react-spring": "^9.7.3"
+		"react-spinners": "^0.13.8",
-  },
+		"react-spring": "^9.7.3"
-  "devDependencies": {
+	},
-    "@ragestudio/hermes": "^0.1.1",
+	"devDependencies": {
-    "@vitejs/plugin-react": "^4.0.4",
+		"@ragestudio/hermes": "^0.1.1",
-    "electron": "25.6.0",
+		"@vitejs/plugin-react": "^4.0.4",
-    "electron-builder": "24.6.3",
+		"electron": "25.6.0",
-    "electron-vite": "^2.1.0",
+		"electron-builder": "24.6.3",
-    "react": "^18.2.0",
+		"electron-vite": "^2.1.0",
-    "react-dom": "^18.2.0",
+		"react": "^18.2.0",
-    "vite": "^4.4.9"
+		"react-dom": "^18.2.0",
-  }
+		"vite": "^4.4.9"
+	}
 }