From fb056cdac1e352b2cf97d61f725c3c3e0a2b1f98 Mon Sep 17 00:00:00 2001 From: txtsd Date: Thu, 20 Oct 2022 13:21:55 +0530 Subject: [PATCH] feat: Agnostify launcher references Signed-off-by: txtsd --- .dockerignore | 2 +- .gitignore | 2 +- README.md | 2 +- clone.sh | 4 ++-- config.sh | 4 ++-- docker-compose.yaml | 2 +- generateFabric.py | 12 ++++++------ generateForge.py | 12 ++++++------ generateLiteloader.py | 8 ++++---- generateMojang.py | 18 +++++++++--------- generateQuilt.py | 12 ++++++------ index.py | 16 ++++++++-------- meta/common/__init__.py | 10 +++++----- meta/common/forge.py | 2 +- status.sh | 2 +- update.sh | 28 ++++++++++++++-------------- 16 files changed, 68 insertions(+), 68 deletions(-) diff --git a/.dockerignore b/.dockerignore index e29e962..373630e 100644 --- a/.dockerignore +++ b/.dockerignore @@ -6,6 +6,6 @@ caches/ __pycache__/ public/ -prismlauncher/ +launcher/ upstream/ config/ diff --git a/.gitignore b/.gitignore index b13aa67..c413caa 100644 --- a/.gitignore +++ b/.gitignore @@ -6,5 +6,5 @@ caches/ !caches/*/.keep __pycache__ config_local.sh -prismlauncher +launcher upstream diff --git a/README.md b/README.md index c8c17d5..352fe34 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ It is recommended to use Docker to deploy the environment. - Make sure it's writable by the container later: `chown -R 1337:1337 .` - Configure `config/config_local.sh` - The defaults should be fine (apart from committer email and name perhaps) -- Put your SSH key (which has push access to meta-upstream and meta-prismlauncher) at `config/deploy.key` +- Put your SSH key (which has push access to meta-upstream and meta-launcher) at `config/deploy.key` - Pull meta- repos: `bash clone.sh` - Customize docker-compose.yaml - Run `docker-compose up -d --build` diff --git a/clone.sh b/clone.sh index 00c0896..350a9b5 100755 --- a/clone.sh +++ b/clone.sh @@ -15,6 +15,6 @@ if [ ! -d "${UPSTREAM_DIR}" ]; then git clone "${UPSTREAM_REPO}" "${UPSTREAM_DIR}" fi -if [ ! -d "${PL_DIR}" ]; then - git clone "${PL_REPO}" "${PL_DIR}" +if [ ! -d "${LAUNCHER_DIR}" ]; then + git clone "${LAUNCHER_REPO}" "${LAUNCHER_DIR}" fi diff --git a/config.sh b/config.sh index 3c4592b..49c3b66 100644 --- a/config.sh +++ b/config.sh @@ -1,7 +1,7 @@ export UPSTREAM_DIR=upstream export UPSTREAM_REPO=git@github.com:PrismLauncher/meta-upstream.git -export PL_DIR=prismlauncher -export PL_REPO=git@github.com:PrismLauncher/meta-prismlauncher.git +export LAUNCHER_DIR=launcher +export LAUNCHER_REPO=git@github.com:PrismLauncher/meta-launcher.git export BRANCH_master=master export BRANCH_develop=develop export DEPLOY_TO_S3=false diff --git a/docker-compose.yaml b/docker-compose.yaml index 4a5f910..f15ea05 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -7,7 +7,7 @@ services: volumes: - "./caches:/app/caches" - "./upstream:/app/upstream" - - "./prismlauncher:/app/prismlauncher" + - "./launcher:/app/launcher" - "./public:/app/public" - "./config:/app/config" restart: unless-stopped diff --git a/generateFabric.py b/generateFabric.py index 32f97d9..531f9f2 100755 --- a/generateFabric.py +++ b/generateFabric.py @@ -1,12 +1,12 @@ import json import os -from meta.common import ensure_component_dir, prismlauncher_path, upstream_path, transform_maven_key +from meta.common import ensure_component_dir, launcher_path, upstream_path, transform_maven_key from meta.common.fabric import JARS_DIR, INSTALLER_INFO_DIR, META_DIR, INTERMEDIARY_COMPONENT, LOADER_COMPONENT from meta.model import MetaVersion, Dependency, Library, MetaPackage, GradleSpecifier from meta.model.fabric import FabricJarInfo, FabricInstallerDataV1, FabricMainClasses -PL_DIR = prismlauncher_path() +LAUNCHER_DIR = launcher_path() UPSTREAM_DIR = upstream_path() ensure_component_dir(LOADER_COMPONENT) @@ -72,7 +72,7 @@ def main(): if not recommended_loader_versions: # first (newest) loader is recommended recommended_loader_versions.append(version) - v.write(os.path.join(PL_DIR, LOADER_COMPONENT, f"{v.version}.json")) + v.write(os.path.join(LAUNCHER_DIR, LOADER_COMPONENT, f"{v.version}.json")) with open(os.path.join(UPSTREAM_DIR, META_DIR, "intermediary.json"), 'r', encoding='utf-8') as f: intermediary_version_index = json.load(f) @@ -84,21 +84,21 @@ def main(): recommended_intermediary_versions.append(version) # all intermediaries are recommended - v.write(os.path.join(PL_DIR, INTERMEDIARY_COMPONENT, f"{v.version}.json")) + v.write(os.path.join(LAUNCHER_DIR, INTERMEDIARY_COMPONENT, f"{v.version}.json")) package = MetaPackage(uid=LOADER_COMPONENT, name='Fabric Loader') package.recommended = recommended_loader_versions package.description = "Fabric Loader is a tool to load Fabric-compatible mods in game environments." package.project_url = "https://fabricmc.net" package.authors = ["Fabric Developers"] - package.write(os.path.join(PL_DIR, LOADER_COMPONENT, "package.json")) + package.write(os.path.join(LAUNCHER_DIR, LOADER_COMPONENT, "package.json")) package = MetaPackage(uid=INTERMEDIARY_COMPONENT, name='Intermediary Mappings') package.recommended = recommended_intermediary_versions package.description = "Intermediary mappings allow using Fabric Loader with mods for Minecraft in a more compatible manner." package.project_url = "https://fabricmc.net" package.authors = ["Fabric Developers"] - package.write(os.path.join(PL_DIR, INTERMEDIARY_COMPONENT, "package.json")) + package.write(os.path.join(LAUNCHER_DIR, INTERMEDIARY_COMPONENT, "package.json")) if __name__ == '__main__': diff --git a/generateForge.py b/generateForge.py index 02d237f..e6bca25 100755 --- a/generateForge.py +++ b/generateForge.py @@ -5,7 +5,7 @@ from distutils.version import LooseVersion from operator import attrgetter from typing import Collection -from meta.common import ensure_component_dir, prismlauncher_path, upstream_path, static_path +from meta.common import ensure_component_dir, launcher_path, upstream_path, static_path from meta.common.forge import FORGE_COMPONENT, INSTALLER_MANIFEST_DIR, VERSION_MANIFEST_DIR, DERIVED_INDEX_FILE, \ STATIC_LEGACYINFO_FILE, INSTALLER_INFO_DIR, BAD_VERSIONS, FORGEWRAPPER_MAVEN from meta.common.mojang import MINECRAFT_COMPONENT @@ -15,7 +15,7 @@ from meta.model.forge import ForgeVersion, ForgeInstallerProfile, ForgeLegacyInf ForgeInstallerProfileV2, InstallerInfo, DerivedForgeIndex, ForgeLegacyInfoList from meta.model.mojang import MojangVersion -PL_DIR = prismlauncher_path() +LAUNCHER_DIR = launcher_path() UPSTREAM_DIR = upstream_path() STATIC_DIR = static_path() @@ -33,7 +33,7 @@ mc_version_cache = {} def load_mc_version_filter(version: str): if version in mc_version_cache: return mc_version_cache[version] - v = MetaVersion.parse_file(os.path.join(PL_DIR, MINECRAFT_COMPONENT, f"{version}.json")) + v = MetaVersion.parse_file(os.path.join(LAUNCHER_DIR, MINECRAFT_COMPONENT, f"{version}.json")) libs = set(map(attrgetter("name"), v.libraries)) mc_version_cache[version] = libs return libs @@ -321,7 +321,7 @@ def main(): recommended_versions.append(version.rawVersion) # If we do not have the corresponding Minecraft version, we ignore it - if not os.path.isfile(os.path.join(PL_DIR, MINECRAFT_COMPONENT, f"{version.mc_version_sane}.json")): + if not os.path.isfile(os.path.join(LAUNCHER_DIR, MINECRAFT_COMPONENT, f"{version.mc_version_sane}.json")): eprint("Skipping %s with no corresponding Minecraft version %s" % (key, version.mc_version_sane)) continue @@ -357,7 +357,7 @@ def main(): v = version_from_legacy(legacy_info_list.number[str(build)], version) - v.write(os.path.join(PL_DIR, FORGE_COMPONENT, f"{v.version}.json")) + v.write(os.path.join(LAUNCHER_DIR, FORGE_COMPONENT, f"{v.version}.json")) recommended_versions.sort() @@ -365,7 +365,7 @@ def main(): package = MetaPackage(uid=FORGE_COMPONENT, name="Forge", project_url="https://www.minecraftforge.net/forum/") package.recommended = recommended_versions - package.write(os.path.join(PL_DIR, FORGE_COMPONENT, "package.json")) + package.write(os.path.join(LAUNCHER_DIR, FORGE_COMPONENT, "package.json")) if __name__ == '__main__': diff --git a/generateLiteloader.py b/generateLiteloader.py index 76fccfd..9f730da 100755 --- a/generateLiteloader.py +++ b/generateLiteloader.py @@ -2,13 +2,13 @@ import os from datetime import datetime from typing import List, Tuple, Dict, Optional -from meta.common import ensure_component_dir, prismlauncher_path, upstream_path +from meta.common import ensure_component_dir, launcher_path, upstream_path from meta.common.liteloader import LITELOADER_COMPONENT, VERSIONS_FILE from meta.common.mojang import MINECRAFT_COMPONENT from meta.model import MetaVersion, GradleSpecifier, Library, MetaPackage, Dependency from meta.model.liteloader import LiteloaderIndex, LiteloaderArtefact -PL_DIR = prismlauncher_path() +LAUNCHER_DIR = launcher_path() UPSTREAM_DIR = upstream_path() ensure_component_dir(LITELOADER_COMPONENT) @@ -93,7 +93,7 @@ def main(): all_versions, recommended = process_versions(index) for version in all_versions: - version.write(os.path.join(PL_DIR, LITELOADER_COMPONENT, f"{version.version}.json")) + version.write(os.path.join(LAUNCHER_DIR, LITELOADER_COMPONENT, f"{version.version}.json")) package = MetaPackage(uid=LITELOADER_COMPONENT, name='LiteLoader', @@ -101,7 +101,7 @@ def main(): project_url=index.meta.url, authors=[index.meta.authors], recommended=recommended) - package.write(os.path.join(PL_DIR, LITELOADER_COMPONENT, "package.json")) + package.write(os.path.join(LAUNCHER_DIR, LITELOADER_COMPONENT, "package.json")) if __name__ == '__main__': diff --git a/generateMojang.py b/generateMojang.py index dce4f41..b825175 100755 --- a/generateMojang.py +++ b/generateMojang.py @@ -6,7 +6,7 @@ from operator import attrgetter from pprint import pprint from typing import Optional, List -from meta.common import ensure_component_dir, prismlauncher_path, upstream_path, static_path +from meta.common import ensure_component_dir, launcher_path, upstream_path, static_path from meta.common.mojang import VERSION_MANIFEST_FILE, MINECRAFT_COMPONENT, LWJGL3_COMPONENT, LWJGL_COMPONENT, \ STATIC_OVERRIDES_FILE, VERSIONS_DIR, LIBRARY_PATCHES_FILE from meta.model import MetaVersion, Library, GradleSpecifier, MojangLibraryDownloads, MojangArtifact, Dependency, \ @@ -15,7 +15,7 @@ from meta.model.mojang import MojangIndexWrap, MojangIndex, MojangVersion, Legac APPLY_SPLIT_NATIVES_WORKAROUND = True -PL_DIR = prismlauncher_path() +LAUNCHER_DIR = launcher_path() UPSTREAM_DIR = upstream_path() STATIC_DIR = static_path() @@ -26,7 +26,7 @@ ensure_component_dir(LWJGL3_COMPONENT) def map_log4j_artifact(version): if version == "2.0-beta9": - return "2.0-beta9-fixed", "https://files.prismlauncher.org/maven/%s" + return "2.0-beta9-fixed", "https://files.launcher.org/maven/%s" return "2.17.1", "https://repo1.maven.org/maven2/%s" # This is the only version that's patched (as of 2022/02/19) @@ -211,13 +211,13 @@ def process_single_variant(lwjgl_variant: MetaVersion, patches: LibraryPatches): v.libraries += list(dict.fromkeys(new_libraries)) if lwjgl_version[0] == '2': - filename = os.path.join(PL_DIR, LWJGL_COMPONENT, f"{lwjgl_version}.json") + filename = os.path.join(LAUNCHER_DIR, LWJGL_COMPONENT, f"{lwjgl_version}.json") v.name = 'LWJGL 2' v.uid = LWJGL_COMPONENT v.conflicts = [Dependency(uid=LWJGL3_COMPONENT)] elif lwjgl_version[0] == '3': - filename = os.path.join(PL_DIR, LWJGL3_COMPONENT, f"{lwjgl_version}.json") + filename = os.path.join(LAUNCHER_DIR, LWJGL3_COMPONENT, f"{lwjgl_version}.json") v.name = 'LWJGL 3' v.uid = LWJGL3_COMPONENT @@ -411,7 +411,7 @@ def main(): # process 1.13 arguments into previous version if not mojang_version.minecraft_arguments and mojang_version.arguments: v.minecraft_arguments = adapt_new_style_arguments(mojang_version.arguments) - out_filename = os.path.join(PL_DIR, MINECRAFT_COMPONENT, f"{v.version}.json") + out_filename = os.path.join(LAUNCHER_DIR, MINECRAFT_COMPONENT, f"{v.version}.json") if v.version in override_index.versions: override = override_index.versions[v.version] override.apply_onto_meta_version(v) @@ -448,18 +448,18 @@ def main(): lwjgl_package = MetaPackage(uid=LWJGL_COMPONENT, name='LWJGL 2') lwjgl_package.recommended = ['2.9.4-nightly-20150209'] - lwjgl_package.write(os.path.join(PL_DIR, LWJGL_COMPONENT, "package.json")) + lwjgl_package.write(os.path.join(LAUNCHER_DIR, LWJGL_COMPONENT, "package.json")) if found_any_lwjgl3: lwjgl_package = MetaPackage(uid=LWJGL3_COMPONENT, name='LWJGL 3') lwjgl_package.recommended = ['3.1.2'] - lwjgl_package.write(os.path.join(PL_DIR, LWJGL3_COMPONENT, "package.json")) + lwjgl_package.write(os.path.join(LAUNCHER_DIR, LWJGL3_COMPONENT, "package.json")) mojang_index = MojangIndexWrap(MojangIndex.parse_file(os.path.join(UPSTREAM_DIR, VERSION_MANIFEST_FILE))) minecraft_package = MetaPackage(uid=MINECRAFT_COMPONENT, name='Minecraft') minecraft_package.recommended = [mojang_index.latest.release] - minecraft_package.write(os.path.join(PL_DIR, MINECRAFT_COMPONENT, "package.json")) + minecraft_package.write(os.path.join(LAUNCHER_DIR, MINECRAFT_COMPONENT, "package.json")) if __name__ == '__main__': diff --git a/generateQuilt.py b/generateQuilt.py index 8ded782..e628dac 100755 --- a/generateQuilt.py +++ b/generateQuilt.py @@ -1,13 +1,13 @@ import json import os -from meta.common import ensure_component_dir, prismlauncher_path, upstream_path, transform_maven_key +from meta.common import ensure_component_dir, launcher_path, upstream_path, transform_maven_key from meta.common.quilt import JARS_DIR, INSTALLER_INFO_DIR, META_DIR, INTERMEDIARY_COMPONENT, LOADER_COMPONENT, \ USE_QUILT_MAPPINGS from meta.model import MetaVersion, Dependency, Library, MetaPackage, GradleSpecifier from meta.model.fabric import FabricJarInfo, FabricInstallerDataV1, FabricMainClasses -PL_DIR = prismlauncher_path() +LAUNCHER_DIR = launcher_path() UPSTREAM_DIR = upstream_path() ensure_component_dir(LOADER_COMPONENT) @@ -77,7 +77,7 @@ def main(): if not recommended_loader_versions and should_recommend: # newest stable loader is recommended recommended_loader_versions.append(version) - v.write(os.path.join(PL_DIR, LOADER_COMPONENT, f"{v.version}.json")) + v.write(os.path.join(LAUNCHER_DIR, LOADER_COMPONENT, f"{v.version}.json")) if USE_QUILT_MAPPINGS: with open(os.path.join(UPSTREAM_DIR, META_DIR, "hashed.json"), 'r', encoding='utf-8') as f: @@ -90,14 +90,14 @@ def main(): recommended_intermediary_versions.append(version) # all intermediaries are recommended - v.write(os.path.join(PL_DIR, INTERMEDIARY_COMPONENT, f"{v.version}.json")) + v.write(os.path.join(LAUNCHER_DIR, INTERMEDIARY_COMPONENT, f"{v.version}.json")) package = MetaPackage(uid=LOADER_COMPONENT, name='Quilt Loader') package.recommended = recommended_loader_versions package.description = "The Quilt project is an open, community-driven modding toolchain designed primarily for Minecraft." package.project_url = "https://quiltmc.org/" package.authors = ["Quilt Project"] - package.write(os.path.join(PL_DIR, LOADER_COMPONENT, "package.json")) + package.write(os.path.join(LAUNCHER_DIR, LOADER_COMPONENT, "package.json")) if USE_QUILT_MAPPINGS: package = MetaPackage(uid=INTERMEDIARY_COMPONENT, name='Quilt Intermediary Mappings') @@ -105,7 +105,7 @@ def main(): package.description = "Intermediary mappings allow using Quilt Loader with mods for Minecraft in a more compatible manner." package.project_url = "https://quiltmc.org/" package.authors = ["Quilt Project"] - package.write(os.path.join(PL_DIR, INTERMEDIARY_COMPONENT, "package.json")) + package.write(os.path.join(LAUNCHER_DIR, INTERMEDIARY_COMPONENT, "package.json")) if __name__ == '__main__': diff --git a/index.py b/index.py index 8327e6e..00c7b54 100755 --- a/index.py +++ b/index.py @@ -2,11 +2,11 @@ import hashlib import os from operator import attrgetter -from meta.common import prismlauncher_path +from meta.common import launcher_path from meta.model import MetaVersion, MetaPackage from meta.model.index import MetaPackageIndex, MetaVersionIndex, MetaVersionIndexEntry, MetaPackageIndexEntry -PL_DIR = prismlauncher_path() +LAUNCHER_DIR = launcher_path() # take the hash type (like hashlib.md5) and filename, return hex string of hash @@ -25,11 +25,11 @@ ignore = {"index.json", "package.json", ".git", ".github"} packages = MetaPackageIndex() # walk through all the package folders -for package in sorted(os.listdir(PL_DIR)): +for package in sorted(os.listdir(LAUNCHER_DIR)): if package in ignore: continue - sharedData = MetaPackage.parse_file(os.path.join(PL_DIR, package, "package.json")) + sharedData = MetaPackage.parse_file(os.path.join(LAUNCHER_DIR, package, "package.json")) recommendedVersions = set() if sharedData.recommended: recommendedVersions = set(sharedData.recommended) @@ -38,12 +38,12 @@ for package in sorted(os.listdir(PL_DIR)): versionList = MetaVersionIndex(uid=package, name=sharedData.name) # walk through all the versions of the package - for filename in os.listdir(PL_DIR + "/%s" % package): + for filename in os.listdir(LAUNCHER_DIR + "/%s" % package): if filename in ignore: continue # parse and hash the version file - filepath = PL_DIR + "/%s/%s" % (package, filename) + filepath = LAUNCHER_DIR + "/%s/%s" % (package, filename) filehash = hash_file(hashlib.sha256, filepath) versionFile = MetaVersion.parse_file(filepath) is_recommended = versionFile.version in recommendedVersions @@ -56,7 +56,7 @@ for package in sorted(os.listdir(PL_DIR)): versionList.versions = sorted(versionList.versions, key=attrgetter('release_time'), reverse=True) # write the version index for the package - outFilePath = PL_DIR + "/%s/index.json" % package + outFilePath = LAUNCHER_DIR + "/%s/index.json" % package versionList.write(outFilePath) # insert entry into the package index @@ -67,4 +67,4 @@ for package in sorted(os.listdir(PL_DIR)): ) packages.packages.append(packageEntry) -packages.write(os.path.join(PL_DIR, "index.json")) +packages.write(os.path.join(LAUNCHER_DIR, "index.json")) diff --git a/meta/common/__init__.py b/meta/common/__init__.py index c0bb11d..e3080ea 100644 --- a/meta/common/__init__.py +++ b/meta/common/__init__.py @@ -10,10 +10,10 @@ def serialize_datetime(dt: datetime.datetime): return dt.isoformat() -def prismlauncher_path(): - if "PL_DIR" in os.environ: - return os.environ["PL_DIR"] - return "prismlauncher" +def launcher_path(): + if "LAUNCHER_DIR" in os.environ: + return os.environ["LAUNCHER_DIR"] + return "launcher" def upstream_path(): @@ -35,7 +35,7 @@ def ensure_upstream_dir(path): def ensure_component_dir(component_id): - path = os.path.join(prismlauncher_path(), component_id) + path = os.path.join(launcher_path(), component_id) if not os.path.exists(path): os.makedirs(path) diff --git a/meta/common/forge.py b/meta/common/forge.py index be62659..abb411b 100644 --- a/meta/common/forge.py +++ b/meta/common/forge.py @@ -13,5 +13,5 @@ STATIC_LEGACYINFO_FILE = join(BASE_DIR, "forge-legacyinfo.json") FORGE_COMPONENT = "net.minecraftforge" -FORGEWRAPPER_MAVEN = "https://files.prismlauncher.org/maven/%s" +FORGEWRAPPER_MAVEN = "https://files.launcher.org/maven/%s" BAD_VERSIONS = ["1.12.2-14.23.5.2851"] diff --git a/status.sh b/status.sh index 80df179..4f04e6a 100755 --- a/status.sh +++ b/status.sh @@ -14,7 +14,7 @@ echo echo "PrismLauncher:" -pushd "${PL_DIR}" || exit 1 +pushd "${LAUNCHER_DIR}" || exit 1 git status popd || exit 1 echo diff --git a/update.sh b/update.sh index bc05a76..1ed51bb 100755 --- a/update.sh +++ b/update.sh @@ -22,7 +22,7 @@ function fail_in { } function fail_out { - prismlauncher_git reset --hard HEAD + launcher_git reset --hard HEAD exit 1 } @@ -30,8 +30,8 @@ function upstream_git { git -C "${BASEDIR}/${UPSTREAM_DIR}" "$@" } -function prismlauncher_git { - git -C "${BASEDIR}/${PL_DIR}" "$@" +function launcher_git { + git -C "${BASEDIR}/${LAUNCHER_DIR}" "$@" } # make sure we *could* push to our repo @@ -59,8 +59,8 @@ if [ "${DEPLOY_TO_GIT}" = true ] ; then fi fi -prismlauncher_git reset --hard HEAD || exit 1 -prismlauncher_git checkout "${BRANCH}" || exit 1 +launcher_git reset --hard HEAD || exit 1 +launcher_git checkout "${BRANCH}" || exit 1 python generateMojang.py || fail_out python generateForge.py || fail_out @@ -70,15 +70,15 @@ python generateLiteloader.py || fail_out python index.py || fail_out if [ "${DEPLOY_TO_GIT}" = true ] ; then - prismlauncher_git add index.json org.lwjgl/* org.lwjgl3/* net.minecraft/* || fail_out - prismlauncher_git add net.minecraftforge/* || fail_out - prismlauncher_git add net.fabricmc.fabric-loader/* net.fabricmc.intermediary/* || fail_out - prismlauncher_git add org.quiltmc.quilt-loader/* || fail_out # TODO: add Quilt hashed, once it is actually used - prismlauncher_git add com.mumfrey.liteloader/* || fail_out + launcher_git add index.json org.lwjgl/* org.lwjgl3/* net.minecraft/* || fail_out + launcher_git add net.minecraftforge/* || fail_out + launcher_git add net.fabricmc.fabric-loader/* net.fabricmc.intermediary/* || fail_out + launcher_git add org.quiltmc.quilt-loader/* || fail_out # TODO: add Quilt hashed, once it is actually used + launcher_git add com.mumfrey.liteloader/* || fail_out - if ! prismlauncher_git diff --cached --exit-code ; then - prismlauncher_git commit -a -m "Update ${currentDate}" || fail_out - prismlauncher_git push || exit 1 + if ! launcher_git diff --cached --exit-code ; then + launcher_git commit -a -m "Update ${currentDate}" || fail_out + launcher_git push || exit 1 fi fi @@ -86,7 +86,7 @@ if [ "${DEPLOY_TO_FOLDER}" = true ] ; then DEPLOY_FOLDER_var="DEPLOY_FOLDER_$MODE" DEPLOY_FOLDER="${!DEPLOY_FOLDER_var}" echo "Deploying to ${DEPLOY_FOLDER}" - rsync -rvog --chown="${DEPLOY_FOLDER_USER}:${DEPLOY_FOLDER_GROUP}" --exclude=.git "${BASEDIR}/${PL_DIR}/" "${DEPLOY_FOLDER}" + rsync -rvog --chown="${DEPLOY_FOLDER_USER}:${DEPLOY_FOLDER_GROUP}" --exclude=.git "${BASEDIR}/${LAUNCHER_DIR}/" "${DEPLOY_FOLDER}" fi exit 0