diff --git a/build.py b/build.py old mode 100644 new mode 100755 index fd1d6c6..32f1f9f --- a/build.py +++ b/build.py @@ -19,6 +19,9 @@ def get_app_name(text): def get_qt_path(): try: + if os.path.exists("/usr/lib/qt6/bin"): + return "/usr/lib/qt6/bin" + return str(subprocess.check_output(["qtpaths6", "--binaries-dir"]), 'utf-8').strip() except: @@ -26,8 +29,8 @@ def get_qt_path(): return input("Please enter the QT bin path (leave blank to cancel the build): ") -def get_qt_lib_path(): - output = str(subprocess.check_output(["qtpaths6", "--query"]), 'utf-8').strip() +def get_qt_lib_path(qt_bin): + output = str(subprocess.check_output([qt_bin + "/qtpaths6", "--query"]), 'utf-8').strip() lines = output.split("\n") ret = "" @@ -196,7 +199,7 @@ def platform_setup(): ins_packages = list_installed_packages() like_distro = get_like_distro() dep_pkgs_a = ["pkg-config", "make", "g++"] - dep_pkgs_b = ["ffmpeg", "libfuse-dev", "fuse3", "imagemagick", "qt6-base-dev"] + dep_pkgs_b = ["ffmpeg", "libfuse3-dev", "libfuse-dev", "fuse3", "imagemagick", "qt6-base-dev"] if not list_of_words_in_text(dep_pkgs_a, ins_packages) or not list_of_words_in_text(dep_pkgs_b, ins_packages): if ("ubuntu" in like_distro) or ("debian" in like_distro) or ("linuxmint" in like_distro): @@ -231,7 +234,7 @@ def main(): qt_bin = get_qt_path() if qt_bin != "": - qt_lib = get_qt_lib_path() + qt_lib = get_qt_lib_path(qt_bin) if qt_lib == "": exit(1) diff --git a/install.py b/install.py old mode 100644 new mode 100755 diff --git a/src/common.h b/src/common.h index bae809c..ea00ecb 100644 --- a/src/common.h +++ b/src/common.h @@ -41,7 +41,7 @@ using namespace std; -#define APP_VERSION "3.6.t8" +#define APP_VERSION "3.6.t9" #define APP_NAME "JustMotion" #define APP_TARGET "jmotion" #define DATETIME_FMT "yyyyMMddhhmmss" diff --git a/src/ram_disk.cpp b/src/ram_disk.cpp index 738081d..49ad1b4 100644 --- a/src/ram_disk.cpp +++ b/src/ram_disk.cpp @@ -252,7 +252,7 @@ QString RamDisk::getFileName(const QString &basePath, const QString &fullPath) if (name.startsWith("/")) { - name.removeFirst(); + name = name.mid(1); } if (name.indexOf("/") == -1)