diff --git a/.gitignore b/.gitignore index f6aef8b..93dc580 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ dist/ +server/ *.ignore \ No newline at end of file diff --git a/build/auto-update b/build/auto-update index 036b3e1..738e6b2 100755 --- a/build/auto-update +++ b/build/auto-update @@ -7,9 +7,9 @@ root="$(realpath "$root")" source "${dir}/pack.properties" cd "${dir}/legacy" -zip -rv "${root}/dist/${TITLE}_Auto-Update-Legacy.zip" +zip -rv --filesync "${root}/dist/${TITLE}_Auto-Update-Legacy.zip" cd - cd "${dir}/unsup" || exit -zip -rv "${root}/dist/${TITLE}_Auto-Update.zip" . +zip -rv --filesync "${root}/dist/${TITLE}_Auto-Update.zip" . cd - || exit printf %s\\n "Auto update distributions created!" diff --git a/build/packwiz b/build/packwiz index c2490ad..a363e0c 100755 --- a/build/packwiz +++ b/build/packwiz @@ -30,8 +30,9 @@ package_resources() { } package_data() { - printf %s "$data_list" | while read -r line + printf %s\\n "$data_list" | while read -r line do + printf %s\\n "Zipping datapack \"$line\"" zip -r "${root}/dist/pack/${line}.zip" ${root}/pack/${line}/* done } @@ -58,18 +59,19 @@ data_list="$(create_list "${root}/pack/config/openloader/data/")" mkdir -p "${root}/dist" -rsync -av --delete --progress "${root}/pack" "${root}/dist" \ - $(printf " --exclude %s" $resource_list) -# # $(printf " --exclude %s" $data_list) +rm -rf "${root}/dist/pack" +rsync -av "${root}/pack" "${root}/dist" \ + $(printf " --exclude %s" $resource_list) \ + $(printf " --exclude %s" $data_list) package_resources -# package_dat +package_data cd "${root}/dist/pack" || exit setup_index -packwiz cf export -o "${root}/dist/${TITLE}_Curseforge.zip" +# packwiz cf export -o "${root}/dist/${TITLE}_Curseforge.zip" packwiz mr export -o "${root}/dist/${TITLE}_Modrinth.zip" -packwiz cf export -o "${root}/dist/${TITLE}_Server.zip" -s server +# packwiz cf export -o "${root}/dist/${TITLE}_Server.zip" -s server cd - || exit echo "Done!" diff --git a/build/run b/build/run index 2c6ef01..b2c97ba 100755 --- a/build/run +++ b/build/run @@ -4,3 +4,4 @@ dir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" "$dir/auto-update" "$dir/packwiz" +"$dir/server" \ No newline at end of file diff --git a/build/server b/build/server new file mode 100755 index 0000000..2fae8ca --- /dev/null +++ b/build/server @@ -0,0 +1,11 @@ +#!/bin/sh + +dir="$(dirname "$(readlink -f "$0")")" +root="${dir}/../" +root="$(realpath "$root")" + +mkdir -p "${root}/server" +cd "${root}/server" || exit +java -jar ../build/legacy/.minecraft/packwiz-installer-bootstrap.jar -g -s server ../dist/pack/pack.toml +rm packwiz-installer.jar +cd - || exit \ No newline at end of file