diff --git a/pkg/PKGBUILD-pre-alpha b/pkg/PKGBUILD-pre-alpha index baf0c46..9f228c5 100644 --- a/pkg/PKGBUILD-pre-alpha +++ b/pkg/PKGBUILD-pre-alpha @@ -1,6 +1,6 @@ # Maintainer: Xgui4 pkgname=lce-qt-launcher-pre-alpha -pkgver=r133.6ca2d83 +pkgver=r135.c9c6b69 pkgrel=1 pkgdesc="A custom Minecraft LCE Launcher written in Python and Qt with GNU/Linux support in mind." arch=('any') diff --git a/scripts/build.cmd b/scripts/build.cmd index 665012a..d5a3f1a 100644 --- a/scripts/build.cmd +++ b/scripts/build.cmd @@ -1,6 +1,6 @@ -pyside6-rcc "res.qrc" -o "src\legacy-qt-launcher\res_rc.py" || exit /b 1 -pyside6-uic "src\system_info.ui" -o "src\legacy-qt-launcher\ui_system_info.py" || exit /b 1 -pyside6-uic "src\form.ui" -o "src\legacy-qt-launcher\ui_form.py" || exit /b 1 -pyside6-uic "src\instance.ui" -o "src\legacy-qt-launcher\ui_instance.py" || exit /b 1 -pyside6-uic "src\settingDialog.ui" -o "src\legacy-qt-launcher\ui_settingDialog.py" || exit /b 1 -pyside6-uic "src\about.ui" -o "src\legacy-qt-launcher\ui_about.py" || exit /b 1 \ No newline at end of file +pyside6-rcc "res.qrc" -o "src\legacy_qt_launcher\res_rc.py" || exit /b 1 +pyside6-uic "src\system_info.ui" -o "src\legacy_qt_launcher\ui_system_info.py" || exit /b 1 +pyside6-uic "src\form.ui" -o "src\legacy_qt_launcher\ui_form.py" || exit /b 1 +pyside6-uic "src\instance.ui" -o "src\legacy_qt_launcher\ui_instance.py" || exit /b 1 +pyside6-uic "src\settingDialog.ui" -o "src\legacy_qt_launcher\ui_settingDialog.py" || exit /b 1 +pyside6-uic "src\about.ui" -o "src\legacy_qt_launcher\ui_about.py" || exit /b 1 \ No newline at end of file diff --git a/scripts/build.sh b/scripts/build.sh index 9dbe8be..9d56750 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -3,18 +3,17 @@ set -e if [[ $(uname -s) != "FreeBSD" ]]; then - /usr/lib/qt6/uic -g python src/form.ui -o src/legacy-qt-launcher/ui_form.py && - /usr/lib/qt6/rcc -g python res.qrc -o src/legacy-qt-launcher/res_rc.py && - /usr/lib/qt6/uic -g python src/system_info.ui -o src/legacy-qt-launcher/ui_system_info.py && - /usr/lib/qt6/uic -g python src/instance.ui -o src/legacy-qt-launcher/ui_instance.py && - /usr/lib/qt6/uic -g python src/instance.ui -o src/legacy-qt-launcher/ui_instance.py && - /usr/lib/qt6/uic -g python src/settingDialog.ui -o src/legacy-qt-launcher/ui_settingDialog.py + /usr/lib/qt6/uic -g python src/form.ui -o src/legacy_qt_launcher/ui_form.py && + /usr/lib/qt6/rcc -g python res.qrc -o src/legacy_qt_launcher/res_rc.py && + /usr/lib/qt6/uic -g python src/system_info.ui -o src/legacy_qt_launcher/ui_system_info.py && + /usr/lib/qt6/uic -g python src/instance.ui -o src/legacy_qt_launcher/ui_instance.py && + /usr/lib/qt6/uic -g python src/settingDialog.ui -o src/legacy_qt_launcher/ui_settingDialog.py else - /usr/local/pyside6/rcc -g python "res.qrc" -o "src/legacy-qt-launcher/res_rc.py" && - /usr/local/pyside6/uic -g python "src/form.ui" -o "src/legacy-qt-launcher/ui_form.py" && - /usr/local/pyside6/uic -g python "src/system_info.ui" -o "src/legacy-qt-launcher/ui_system_info.py" - /usr/local/pyside6/uic -g python "src/settingDialog.ui" -o "src/legacy-qt-launcher/ui_settingDialog.py" - /usr/local/pyside6/uic -g python "src/about.ui" -o "src/legacy-qt-launcher/ui_about.py" + /usr/local/pyside6/rcc -g python "res.qrc" -o "src/legacy_qt_launcher/res_rc.py" && + /usr/local/pyside6/uic -g python "src/form.ui" -o "src/legacy_qt_launcher/ui_form.py" && + /usr/local/pyside6/uic -g python "src/system_info.ui" -o "src/legacy_qt_launcher/ui_system_info.py" + /usr/local/pyside6/uic -g python "src/settingDialog.ui" -o "src/legacy_qt_launcher/ui_settingDialog.py" + /usr/local/pyside6/uic -g python "src/about.ui" -o "src/legacy_qt_launcher/ui_about.py" fi diff --git a/scripts/clean.ps1 b/scripts/clean.ps1 index 7bd1c3f..8d2e0b6 100644 --- a/scripts/clean.ps1 +++ b/scripts/clean.ps1 @@ -4,11 +4,11 @@ $ErrorActionPreference = 'Stop' Remove-Item -Path "dist" -Recurse -Remove-Item -Path "src\legacy-qt-launcher\res_rc.py" -Remove-Item -Path "src\legacy-qt-launcher\ui_system_info.py" -Remove-Item -Path "src\legacy-qt-launcher\ui_form.py" -Remove-Item -Path "src\legacy-qt-launcher\ui_instance.py" -Remove-Item -Path "src\legacy-qt-launcher\ui_settingDialog.py" -Remove-Item -Path "src\legacy-qt-launcher\ui_about.py" +Remove-Item -Path "src\legacy_qt_launcher\res_rc.py" +Remove-Item -Path "src\legacy_qt_launcher\ui_system_info.py" +Remove-Item -Path "src\legacy_qt_launcher\ui_form.py" +Remove-Item -Path "src\legacy_qt_launcher\ui_instance.py" +Remove-Item -Path "src\legacy_qt_launcher\ui_settingDialog.py" +Remove-Item -Path "src\legacy_qt_launcher\ui_about.py" Get-ChildItem -Path . -Recurse -Include '__pycache__', '*.pyc' | Remove-Item -Recurse -Force \ No newline at end of file diff --git a/scripts/clean.sh b/scripts/clean.sh index 8ad35a7..7bddd47 100755 --- a/scripts/clean.sh +++ b/scripts/clean.sh @@ -4,11 +4,11 @@ set -e rm -rf dist/ -rm "src/legacy-qt-launcher/res_rc.py" -rm "src/legacy-qt-launcher/ui_system_info.py" -rm "src/legacy-qt-launcher/ui_form.py" -rm "src/legacy-qt-launcher/ui_instance.py" -rm "src/legacy-qt-launcher/ui_settingDialog.py" -rm "src/legacy-qt-launcher/ui_about.py" +rm "src/legacy_qt_launcher/res_rc.py" +rm "src/legacy_qt_launcher/ui_system_info.py" +rm "src/legacy_qt_launcher/ui_form.py" +rm "src/legacy_qt_launcher/ui_instance.py" +rm "src/legacy_qt_launcher/ui_settingDialog.py" +rm "src/legacy_qt_launcher/ui_about.py" rm -rf "*/__pycache__" \ No newline at end of file diff --git a/scripts/packages.ps1 b/scripts/packages.ps1 index 167f1b2..5454945 100644 --- a/scripts/packages.ps1 +++ b/scripts/packages.ps1 @@ -1,5 +1,5 @@ $ErrorActionPreference = 'Stop' $PSNativeCommandUseErrorActionPreference = $true -hatch run python -m nuitka --standalone --assume-yes-for-download --output-dir=dist src\legacy-qt-launcher\main.py -Compress-Archive -Path distlegacy-qt-launcher.dist\* -DestinationPath LCE-Qt-Launcher-Windows.zip \ No newline at end of file +hatch run python -m nuitka --standalone --assume-yes-for-download --output-dir=dist src\legacy_qt_launcher\main.py +Compress-Archive -Path dist/legacy-qt-launcher.dist\* -DestinationPath LCE-Qt-Launcher-Windows.zip \ No newline at end of file diff --git a/scripts/packages.sh b/scripts/packages.sh index 963725c..abcc22e 100755 --- a/scripts/packages.sh +++ b/scripts/packages.sh @@ -4,5 +4,5 @@ set -e scripts/prepare.sh -hatch run python -m nuitka --standalone --assume-yes-for-download --output-dir=dist src/legacy-qt-launcher/main.py +hatch run python -m nuitka --standalone --assume-yes-for-download --output-dir=dist src/legacy_qt_launcher/main.py tar -czf LCE-Qt-Launcher-Linux.tar.gz -C dist/legacy-qt-launcher/.dist . \ No newline at end of file diff --git a/scripts/run.cmd b/scripts/run.cmd index c27715f..bbdbd87 100644 --- a/scripts/run.cmd +++ b/scripts/run.cmd @@ -2,4 +2,4 @@ call .venv\Scripts\activate.bat || exit /b 1 -python src\legacy-qt-launcher\main.py || exit /b 1 \ No newline at end of file +python src\legacy_qt_launcher\main.py || exit /b 1 \ No newline at end of file diff --git a/scripts/run.sh b/scripts/run.sh index d72c1d0..001ce4d 100755 --- a/scripts/run.sh +++ b/scripts/run.sh @@ -5,4 +5,4 @@ set -e # shellcheck source=/dev/null source .venv/bin/activate -src/legacy-qt-launcher/main.py \ No newline at end of file +src/legacy_qt_launcher/main.py \ No newline at end of file