summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortxtsd <code@ihavea.quest>2022-10-20 12:09:47 +0530
committertxtsd <code@ihavea.quest>2022-10-20 12:09:47 +0530
commit852b490c0428ff8296ae11abe931c69af734ac57 (patch)
tree0cc150f63cb082ad5e42e75c8b1ad93af73b99d4
parentc6f60ad6772d9617bf548640d183614b545f904b (diff)
downloadProject-Tick-852b490c0428ff8296ae11abe931c69af734ac57.tar.gz
Project-Tick-852b490c0428ff8296ae11abe931c69af734ac57.zip
feat: Rebrand
Signed-off-by: txtsd <code@ihavea.quest>
-rw-r--r--.dockerignore2
-rw-r--r--.gitignore2
-rw-r--r--README.md6
-rwxr-xr-xclone.sh4
-rw-r--r--config.sh6
-rw-r--r--docker-compose.yaml2
-rwxr-xr-xgenerateFabric.py12
-rwxr-xr-xgenerateForge.py12
-rwxr-xr-xgenerateLiteloader.py8
-rwxr-xr-xgenerateMojang.py16
-rwxr-xr-xgenerateQuilt.py12
-rwxr-xr-xindex.py16
-rw-r--r--meta/common/__init__.py10
-rwxr-xr-xstatus.sh4
-rwxr-xr-xupdate.sh30
15 files changed, 71 insertions, 71 deletions
diff --git a/.dockerignore b/.dockerignore
index e56aea5790..e29e962db8 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -6,6 +6,6 @@ caches/
__pycache__/
public/
-polymc/
+prismlauncher/
upstream/
config/
diff --git a/.gitignore b/.gitignore
index a50a8b44ff..7ed1ec8c7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,5 +7,5 @@ caches/
.idea/
__pycache__
config_local.sh
-polymc
+prismlauncher
upstream
diff --git a/README.md b/README.md
index 5c7dacba38..c515e121ce 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-# PolyMC Meta
-Scripts to generate jsons and jars that PolyMC will access.
+# Prism Launcher Meta
+Scripts to generate jsons and jars that Prism Launcher will access.
## Deployment
It is recommended to use Docker to deploy the environment.
@@ -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-polymc) at `config/deploy.key`
+- Put your SSH key (which has push access to meta-upstream and meta-prismlauncher) 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 1dfaba5895..00c0896838 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 "${PMC_DIR}" ]; then
- git clone "${PMC_REPO}" "${PMC_DIR}"
+if [ ! -d "${PL_DIR}" ]; then
+ git clone "${PL_REPO}" "${PL_DIR}"
fi
diff --git a/config.sh b/config.sh
index 5a85fa5ce3..3c4592ba82 100644
--- a/config.sh
+++ b/config.sh
@@ -1,7 +1,7 @@
export UPSTREAM_DIR=upstream
-export UPSTREAM_REPO=git@github.com:PolyMC/meta-upstream.git
-export PMC_DIR=polymc
-export PMC_REPO=git@github.com:PolyMC/meta-polymc.git
+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 BRANCH_master=master
export BRANCH_develop=develop
export DEPLOY_TO_S3=false
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 94461752b0..4a5f910269 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -7,7 +7,7 @@ services:
volumes:
- "./caches:/app/caches"
- "./upstream:/app/upstream"
- - "./polymc:/app/polymc"
+ - "./prismlauncher:/app/prismlauncher"
- "./public:/app/public"
- "./config:/app/config"
restart: unless-stopped
diff --git a/generateFabric.py b/generateFabric.py
index dc81036ec3..32f97d9c75 100755
--- a/generateFabric.py
+++ b/generateFabric.py
@@ -1,12 +1,12 @@
import json
import os
-from meta.common import ensure_component_dir, polymc_path, upstream_path, transform_maven_key
+from meta.common import ensure_component_dir, prismlauncher_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
-PMC_DIR = polymc_path()
+PL_DIR = prismlauncher_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(PMC_DIR, LOADER_COMPONENT, f"{v.version}.json"))
+ v.write(os.path.join(PL_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(PMC_DIR, INTERMEDIARY_COMPONENT, f"{v.version}.json"))
+ v.write(os.path.join(PL_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(PMC_DIR, LOADER_COMPONENT, "package.json"))
+ package.write(os.path.join(PL_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(PMC_DIR, INTERMEDIARY_COMPONENT, "package.json"))
+ package.write(os.path.join(PL_DIR, INTERMEDIARY_COMPONENT, "package.json"))
if __name__ == '__main__':
diff --git a/generateForge.py b/generateForge.py
index ad7561272c..93c7e9b97b 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, polymc_path, upstream_path, static_path
+from meta.common import ensure_component_dir, prismlauncher_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
-PMC_DIR = polymc_path()
+PL_DIR = prismlauncher_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(PMC_DIR, MINECRAFT_COMPONENT, f"{version}.json"))
+ v = MetaVersion.parse_file(os.path.join(PL_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(PMC_DIR, MINECRAFT_COMPONENT, f"{version.mc_version_sane}.json")):
+ if not os.path.isfile(os.path.join(PL_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(PMC_DIR, FORGE_COMPONENT, f"{v.version}.json"))
+ v.write(os.path.join(PL_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(PMC_DIR, FORGE_COMPONENT, "package.json"))
+ package.write(os.path.join(PL_DIR, FORGE_COMPONENT, "package.json"))
if __name__ == '__main__':
diff --git a/generateLiteloader.py b/generateLiteloader.py
index 17882d582b..76fccfd670 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, polymc_path, upstream_path
+from meta.common import ensure_component_dir, prismlauncher_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
-PMC_DIR = polymc_path()
+PL_DIR = prismlauncher_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(PMC_DIR, LITELOADER_COMPONENT, f"{version.version}.json"))
+ version.write(os.path.join(PL_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(PMC_DIR, LITELOADER_COMPONENT, "package.json"))
+ package.write(os.path.join(PL_DIR, LITELOADER_COMPONENT, "package.json"))
if __name__ == '__main__':
diff --git a/generateMojang.py b/generateMojang.py
index 2b365a9adb..dce4f4186d 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, polymc_path, upstream_path, static_path
+from meta.common import ensure_component_dir, prismlauncher_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
-PMC_DIR = polymc_path()
+PL_DIR = prismlauncher_path()
UPSTREAM_DIR = upstream_path()
STATIC_DIR = static_path()
@@ -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(PMC_DIR, LWJGL_COMPONENT, f"{lwjgl_version}.json")
+ filename = os.path.join(PL_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(PMC_DIR, LWJGL3_COMPONENT, f"{lwjgl_version}.json")
+ filename = os.path.join(PL_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(PMC_DIR, MINECRAFT_COMPONENT, f"{v.version}.json")
+ out_filename = os.path.join(PL_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(PMC_DIR, LWJGL_COMPONENT, "package.json"))
+ lwjgl_package.write(os.path.join(PL_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(PMC_DIR, LWJGL3_COMPONENT, "package.json"))
+ lwjgl_package.write(os.path.join(PL_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(PMC_DIR, MINECRAFT_COMPONENT, "package.json"))
+ minecraft_package.write(os.path.join(PL_DIR, MINECRAFT_COMPONENT, "package.json"))
if __name__ == '__main__':
diff --git a/generateQuilt.py b/generateQuilt.py
index e48573289f..d0563e1930 100755
--- a/generateQuilt.py
+++ b/generateQuilt.py
@@ -1,13 +1,13 @@
import json
import os
-from meta.common import ensure_component_dir, polymc_path, upstream_path, transform_maven_key
+from meta.common import ensure_component_dir, prismlauncher_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
-PMC_DIR = polymc_path()
+PL_DIR = prismlauncher_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(PMC_DIR, LOADER_COMPONENT, f"{v.version}.json"))
+ v.write(os.path.join(PL_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(PMC_DIR, INTERMEDIARY_COMPONENT, f"{v.version}.json"))
+ v.write(os.path.join(PL_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(PMC_DIR, LOADER_COMPONENT, "package.json"))
+ package.write(os.path.join(PL_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(PMC_DIR, INTERMEDIARY_COMPONENT, "package.json"))
+ package.write(os.path.join(PL_DIR, INTERMEDIARY_COMPONENT, "package.json"))
if __name__ == '__main__':
diff --git a/index.py b/index.py
index 8bc71d7ec6..d812e0439e 100755
--- a/index.py
+++ b/index.py
@@ -2,11 +2,11 @@ import hashlib
import os
from operator import attrgetter
-from meta.common import polymc_path
+from meta.common import prismlauncher_path
from meta.model import MetaVersion, MetaPackage
from meta.model.index import MetaPackageIndex, MetaVersionIndex, MetaVersionIndexEntry, MetaPackageIndexEntry
-PMC_DIR = polymc_path()
+PL_DIR = prismlauncher_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 thorugh all the package folders
-for package in sorted(os.listdir(PMC_DIR)):
+for package in sorted(os.listdir(PL_DIR)):
if package in ignore:
continue
- sharedData = MetaPackage.parse_file(os.path.join(PMC_DIR, package, "package.json"))
+ sharedData = MetaPackage.parse_file(os.path.join(PL_DIR, package, "package.json"))
recommendedVersions = set()
if sharedData.recommended:
recommendedVersions = set(sharedData.recommended)
@@ -38,12 +38,12 @@ for package in sorted(os.listdir(PMC_DIR)):
versionList = MetaVersionIndex(uid=package, name=sharedData.name)
# walk through all the versions of the package
- for filename in os.listdir(PMC_DIR + "/%s" % package):
+ for filename in os.listdir(PL_DIR + "/%s" % package):
if filename in ignore:
continue
# parse and hash the version file
- filepath = PMC_DIR + "/%s/%s" % (package, filename)
+ filepath = PL_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(PMC_DIR)):
versionList.versions = sorted(versionList.versions, key=attrgetter('release_time'), reverse=True)
# write the version index for the package
- outFilePath = PMC_DIR + "/%s/index.json" % package
+ outFilePath = PL_DIR + "/%s/index.json" % package
versionList.write(outFilePath)
# insert entry into the package index
@@ -67,4 +67,4 @@ for package in sorted(os.listdir(PMC_DIR)):
)
packages.packages.append(packageEntry)
-packages.write(os.path.join(PMC_DIR, "index.json"))
+packages.write(os.path.join(PL_DIR, "index.json"))
diff --git a/meta/common/__init__.py b/meta/common/__init__.py
index ee294f00b3..04ca0d3cc7 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 polymc_path():
- if "PMC_DIR" in os.environ:
- return os.environ["PMC_DIR"]
- return "polymc"
+def prismlauncher_path():
+ if "PL_DIR" in os.environ:
+ return os.environ["PL_DIR"]
+ return "prismlauncher"
def upstream_path():
@@ -35,7 +35,7 @@ def ensure_upstream_dir(path):
def ensure_component_dir(component_id):
- path = os.path.join(polymc_path(), component_id)
+ path = os.path.join(prismlauncher_path(), component_id)
if not os.path.exists(path):
os.makedirs(path)
diff --git a/status.sh b/status.sh
index 6d6c28ec4e..80df1797b2 100755
--- a/status.sh
+++ b/status.sh
@@ -13,8 +13,8 @@ popd || exit 1
echo
-echo "PolyMC:"
-pushd "${PMC_DIR}" || exit 1
+echo "PrismLauncher:"
+pushd "${PL_DIR}" || exit 1
git status
popd || exit 1
echo
diff --git a/update.sh b/update.sh
index 93d049e753..bc05a7674f 100755
--- a/update.sh
+++ b/update.sh
@@ -22,7 +22,7 @@ function fail_in {
}
function fail_out {
- polymc_git reset --hard HEAD
+ prismlauncher_git reset --hard HEAD
exit 1
}
@@ -30,8 +30,8 @@ function upstream_git {
git -C "${BASEDIR}/${UPSTREAM_DIR}" "$@"
}
-function polymc_git {
- git -C "${BASEDIR}/${PMC_DIR}" "$@"
+function prismlauncher_git {
+ git -C "${BASEDIR}/${PL_DIR}" "$@"
}
# make sure we *could* push to our repo
@@ -59,8 +59,8 @@ if [ "${DEPLOY_TO_GIT}" = true ] ; then
fi
fi
-polymc_git reset --hard HEAD || exit 1
-polymc_git checkout "${BRANCH}" || exit 1
+prismlauncher_git reset --hard HEAD || exit 1
+prismlauncher_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
- polymc_git add index.json org.lwjgl/* org.lwjgl3/* net.minecraft/* || fail_out
- polymc_git add net.minecraftforge/* || fail_out
- polymc_git add net.fabricmc.fabric-loader/* net.fabricmc.intermediary/* || fail_out
- polymc_git add org.quiltmc.quilt-loader/* || fail_out # TODO: add Quilt hashed, once it is actually used
- polymc_git add com.mumfrey.liteloader/* || fail_out
-
- if ! polymc_git diff --cached --exit-code ; then
- polymc_git commit -a -m "Update ${currentDate}" || fail_out
- polymc_git push || exit 1
+ 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
+
+ if ! prismlauncher_git diff --cached --exit-code ; then
+ prismlauncher_git commit -a -m "Update ${currentDate}" || fail_out
+ prismlauncher_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}/${PMC_DIR}/" "${DEPLOY_FOLDER}"
+ rsync -rvog --chown="${DEPLOY_FOLDER_USER}:${DEPLOY_FOLDER_GROUP}" --exclude=.git "${BASEDIR}/${PL_DIR}/" "${DEPLOY_FOLDER}"
fi
exit 0