diff --git a/pkg/PKGBUILD-nighty b/pkg/PKGBUILD-nighty index 78dc69b..5ec6832 100644 --- a/pkg/PKGBUILD-nighty +++ b/pkg/PKGBUILD-nighty @@ -46,8 +46,8 @@ build() { package() { cd "$pkgname" /usr/bin/python -m installer --destdir="$pkgdir" dist/*.whl - install -Dm644 "data/*" "opt/lce_qt_launcher/data" - install -Dm644 "assets/*" "opt/lce_qt_launcher/assets" + install -d "$pkgdir/opt/lce_qt_launcher" + cp -ra data assets "$pkgdir/opt/lce_qt_launcher/" install -Dm644 "pkg/github.io.xgui4.lce_qt_launcher.desktop" "$pkgdir/usr/share/applications/github.io.xgui4.lce_qt_launcher.desktop.desktop" install -Dm644 license.md -t "$pkgdir/usr/share/licenses/$pkgname/" install -Dm644 readme.md code-of-conduct.md -t "$pkgdir/usr/share/doc/$pkgname/" diff --git a/pkg/PKGBUILD-pre-alpha b/pkg/PKGBUILD-pre-alpha index a99ff69..2a39869 100644 --- a/pkg/PKGBUILD-pre-alpha +++ b/pkg/PKGBUILD-pre-alpha @@ -1,6 +1,6 @@ # Maintainer: Xgui4 pkgname=lce-qt-launcher-pre-alpha -pkgver=r136.699f53b +pkgver=r137.c6dc727 pkgrel=1 pkgdesc="A custom Minecraft LCE Launcher written in Python and Qt with GNU/Linux support in mind." arch=('any') @@ -46,8 +46,8 @@ build() { package() { cd "$pkgname" /usr/bin/python -m installer --destdir="$pkgdir" dist/*.whl - install -Dm644 "data" "opt/lce_qt_launcher/data" - install -Dm644 "assets" "opt/lce_qt_launcher/assets" + install -d "$pkgdir/opt/lce_qt_launcher" + cp -ra data assets "$pkgdir/opt/lce_qt_launcher/" install -Dm644 "pkg/github.io.xgui4.lce_qt_launcher.desktop" "$pkgdir/usr/share/applications/github.io.xgui4.lce_qt_launcher.desktop.desktop" install -Dm644 license.md -t "$pkgdir/usr/share/licenses/$pkgname/" install -Dm644 readme.md code-of-conduct.md -t "$pkgdir/usr/share/doc/$pkgname/" diff --git a/src/lce_qt_launcher/main.py b/src/lce_qt_launcher/main.py index 803ecde..76ff910 100755 --- a/src/lce_qt_launcher/main.py +++ b/src/lce_qt_launcher/main.py @@ -38,11 +38,11 @@ from lce_qt_launcher.views.cmd_arg import CmdArgAction, parse_args, argsDetected from lce_qt_launcher.app_context import AppContext from lce_qt_launcher.app import App -from lce_qt_launcher.ui_form import Ui_launcher -from lce_qt_launcher.ui_instance import Ui_InstancesEditor -from lce_qt_launcher.ui_system_info import Ui_sys_info_dialog -from lce_qt_launcher.ui_settingDialog import Ui_settingDialog -from lce_qt_launcher.ui_about import Ui_AboutDialog +from ui_form import Ui_launcher +from ui_instance import Ui_InstancesEditor +from ui_system_info import Ui_sys_info_dialog +from ui_settingDialog import Ui_settingDialog +from ui_about import Ui_AboutDialog import sys import os