Merge branch 'Thunder' of gitee.com:spark-store-project/spark-store into dev

Signed-off-by: shenmo <jifengshenmo@outlook.com>

debian/spark-store.prerm

@@ -12,6 +12,7 @@ function notify-send()
 }
 
 if [ "$1" = "remove" -o "$1" = "purge" ] ; then
+
 	echo "$1"
 	echo "卸载操作，进行配置清理"
 
@@ -32,33 +33,29 @@ if [ "$1" = "remove" -o "$1" = "purge" ] ; then
 	# Remove residual symbol links to stop upgrade detect
 	rm -f /etc/xdg/autostart/spark-update-notifier.desktop
 	# Remove config files
-for username in `ls /home`      
-    do
-      echo /home/$username
-        if [ -d /home/$username/.config/spark-union/spark-store ]
-        then
-        rm -rf /home/$username/.config/spark-union/spark-store
-        fi
-    done
+	for username in `ls /home`; do
+		echo /home/$username
+		if [ -d /home/$username/.config/spark-union/spark-store ]; then
+			rm -rf /home/$username/.config/spark-union/spark-store
+		fi
+	done
 
 
 	# Shutdown services
-	systemctl stop spark-update-notifier
-	# Stop update detect service
-	systemctl disable spark-update-notifier
+	systemctl disable spark-update-notifier --now || true
 
 
 
 	# Remove gpg key file
 	rm -f /etc/apt/trusted.gpg.d/spark-store.gpg
 	apt-key del '9D9A A859 F750 24B1 A1EC  E16E 0E41 D354 A29A 440C'
+
 else
-	
+
 	if [ ! -z "`pidof spark-store`" ] ; then
 		echo "关闭已有 spark-store.."
 		notify-send "正在升级星火商店" "请在升级结束后重启星火商店" -i spark-store
 		killall spark-store
 	fi
+
 fi
-
-