feat(install): support flatpak QQ (#175)

* feat(install): support flatpak QQ * also add support for uninstall script
FlysoftBeta · Jul 17, 2023 · de30a20 · de30a20
1 parent b218d42
commit de30a20
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/publish/install.sh b/publish/install.sh
@@ -9,7 +9,7 @@ if [ ! "$(whoami)" == "root" ]; then
     exit 0
 fi
 
-qq_installation_dir=$( dirname $( readlink $( which qq || which linuxqq ) ) )
+qq_installation_dir=$( dirname $( readlink $( which qq || which linuxqq ) ) || echo "/var/lib/flatpak/app/com.qq.QQ/current/active/files/extra/QQ" )
 if [ ! -d "$qq_installation_dir" ]; then
     echo "未找到 QQNT 安装目录。"
 fi

diff --git a/publish/uninstall.sh b/publish/uninstall.sh
@@ -9,7 +9,7 @@ if [ ! "$(whoami)" == "root" ]; then
     exit 0
 fi
 
-qq_installation_dir=$( dirname $( readlink $( which qq || which linuxqq ) ) )
+qq_installation_dir=$( dirname $( readlink $( which qq || which linuxqq ) ) || echo "/var/lib/flatpak/app/com.qq.QQ/current/active/files/extra/QQ"  )
 if [ ! -d "$qq_installation_dir" ]; then
     echo "未找到 QQNT 安装目录。"
 fi

diff --git a/scripts/start.ps1 b/scripts/start.ps1
@@ -1,6 +1,6 @@
 $ErrorActionPreference = "Stop"
 
-Set-Location (Split-Path -Parent $MyInvocation.MyCommand.Definition)
+Set-Location ((Split-Path -Parent $MyInvocation.MyCommand.Definition) + "..")
 
 foreach ($RegistryPath in @("HKLM:\Software\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\*", "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\*")) {
     try {

diff --git a/scripts/start.sh b/scripts/start.sh
@@ -2,4 +2,4 @@
 
 cd "$( dirname "${BASH_SOURCE[0]}" )/.."
 
-( qq || linuxqq ) 2>&1 | sed -e '/NODE_TLS_REJECT_UNAUTHORIZED/d' -e '/Gtk-Message/d' -e '/to show where the warning was created/d' -e '/gbm_wrapper\.cc/d' -e '/node_bindings\.cc/d' -e '/UnhandledPromiseRejectionWarning/d' -e '/\[BuglyManager\.cpp\]/d' -e '/\[NativeCrashHandler\.cpp\]/d' -e '/\[BuglyService\.cpp\]/d' -e '/\[HotUpdater\]/d' -e '/ERROR:CONSOLE/d'
+( qq || linuxqq || flatpak run com.qq.QQ ) 2>&1 | sed -e '/NODE_TLS_REJECT_UNAUTHORIZED/d' -e '/Gtk-Message/d' -e '/to show where the warning was created/d' -e '/gbm_wrapper\.cc/d' -e '/node_bindings\.cc/d' -e '/UnhandledPromiseRejectionWarning/d' -e '/\[BuglyManager\.cpp\]/d' -e '/\[NativeCrashHandler\.cpp\]/d' -e '/\[BuglyService\.cpp\]/d' -e '/\[HotUpdater\]/d' -e '/ERROR:CONSOLE/d'
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@

		cd "$( dirname "${BASH_SOURCE[0]}" )/.."

		( qq \|\| linuxqq ) 2>&1 \| sed -e '/NODE_TLS_REJECT_UNAUTHORIZED/d' -e '/Gtk-Message/d' -e '/to show where the warning was created/d' -e '/gbm_wrapper\.cc/d' -e '/node_bindings\.cc/d' -e '/UnhandledPromiseRejectionWarning/d' -e '/\[BuglyManager\.cpp\]/d' -e '/\[NativeCrashHandler\.cpp\]/d' -e '/\[BuglyService\.cpp\]/d' -e '/\[HotUpdater\]/d' -e '/ERROR:CONSOLE/d'
		( qq \|\| linuxqq \|\| flatpak run com.qq.QQ ) 2>&1 \| sed -e '/NODE_TLS_REJECT_UNAUTHORIZED/d' -e '/Gtk-Message/d' -e '/to show where the warning was created/d' -e '/gbm_wrapper\.cc/d' -e '/node_bindings\.cc/d' -e '/UnhandledPromiseRejectionWarning/d' -e '/\[BuglyManager\.cpp\]/d' -e '/\[NativeCrashHandler\.cpp\]/d' -e '/\[BuglyService\.cpp\]/d' -e '/\[HotUpdater\]/d' -e '/ERROR:CONSOLE/d'