同步dev

tool/auto-install-policy/store.spark-app.ssinstall.policy

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE policyconfig PUBLIC "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
-<policyconfig>
-    <vendor>Spark Store</vendor>
-    <icon_name>x-package-repository</icon_name>
-    <action id="store.spark-app.ssinstall">
-        <description>运行ssinstall需要权限</description>
-        <message>要使用ssinstall需要权限</message>
-        <defaults>
-            <allow_any>yes</allow_any>
-            <allow_inactive>yes</allow_inactive>
-            <allow_active>yes</allow_active>
-        </defaults>
-        <annotate key="org.freedesktop.policykit.exec.path">/usr/local/bin/ssinstall</annotate>
-        <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
-    </action>
-</policyconfig>

tool/update-upgrade/ss-do-upgrade.sh

@@ -1,8 +1,13 @@
 #!/bin/bash
+if [ "$(id -u)" != "0" ] ; then
+	pkexec "$0" "$@"
+	exit
+fi
 trap "rm -f  /tmp/spark-store/upgradeStatus.txt" EXIT
 source /opt/durapps/spark-store/bin/bashimport/transhell.amber
 load_transhell_debug
 
+
 function get_name_from_desktop_file() {
 	local app_name_in_desktop
 	local name_orig