!85 修改： debian/spark-store.postinst 重命名： tool/ss-apt-fast -> tool/aptss

* 删除文件 spark-wine7-devel_7.14~spark-1_amd64.deb
* final
* 	修改：     debian/spark-store.postinst
* 	修改：     tool/update-upgrade/ss-update-controler.sh
* 	修改：     debian/spark-store.postinst
* 只额外生成一份给aptss
* 	修改：     debian/spark-store.postinst
*  要提交的变更：
* 	修改：     tool/aptss
* 	修改：     debian/changelog
* 	修改：     pkg/usr/share/bash-completion/completions/aptss
* 	修改：     pkg/usr/share/bash-completion/completions/aptss
* 	修改：     debian/spark-store.postinst
* aa
* Merge branch 'master' of https://gitee.com/deepin-community-store/spark-store
* 	修改：     src/main.cpp
* Merge branch 'master' of https://gitee.com/deepin-community-store/spark-store
* 	修改：     debian/spark-store.postinst

tool/update-upgrade/autostart/spark-update-notifier.desktop

@@ -1,5 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Exec=/opt/durapps/spark-store/bin/update-upgrade/ss-update-notify.sh
-Name=spark-update-notifier

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

@@ -16,14 +16,14 @@ echo "UOS中系统依赖无法使用第三方下载工具，使用apt-fast下载
   for PKG_NAME in $PKG_LIST;
   do
     echo "$PKG_NAME 正在下载..."
-  sudo /usr/local/bin/ss-apt-fast download "$PKG_NAME" -y >/dev/null 2>&1;
+  sudo aptss download "$PKG_NAME" -y >/dev/null 2>&1;
   done
    
   echo "----开始安装"
   for PKG_NAME in $PKG_LIST;
   do
     echo "$PKG_NAME 正在准备更新..."
-    if sudo bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt install "$PKG_NAME" -y >/dev/null 2>&1;
+    if sudo bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt install "$PKG_NAME" -y   >/dev/null 2>&1;
     then
       echo "$PKG_NAME 已更新"
     else
@@ -38,7 +38,7 @@ else ###这是确定是否为UOS
   for PKG_NAME in $PKG_LIST;
   do
     echo "$PKG_NAME 正在准备更新..."
-    if sudo /usr/local/bin/ss-apt-fast install "$PKG_NAME" -y >/dev/null 2>&1;
+    if sudo aptss install "$PKG_NAME" -y >/dev/null 2>&1;
     then
       echo "$PKG_NAME 已更新"
     else

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

@@ -51,20 +51,15 @@ case $option in
 	;;
 	1)
 	echo "执行以下操作需要授权..."
-	if [  -f /etc/xdg/autostart/spark-update-notifier.desktop ];then 
+	if [  -e /etc/systemd/system/multi-user.target.wants/spark-update-notifier.service ];then 
 	echo "---检测到已经启动了自动更新检测，执行关闭"
 	sudo systemctl disable spark-update-notifier
-	sudo rm /etc/xdg/autostart/spark-update-notifier.desktop
 	sleep 3
 	reset
 	else
 	echo "---未检测到自动更新检测，执行启动"
 	sudo systemctl enable spark-update-notifier
 	sudo service spark-update-notifier start
-#	ln -s /opt/durapps/spark-store/bin/update-upgrade/autostart/spark-update-notifier.desktop $XDG_CONFIG_HOME/autostart
-#	
-	sudo ln -s /opt/durapps/spark-store/bin/update-upgrade/autostart/spark-update-notifier.desktop /etc/xdg/autostart
-	/opt/durapps/spark-store/bin/update-upgrade/ss-update-notify.sh now
 	sleep 3
 	reset
 	fi
@@ -72,8 +67,8 @@ case $option in
 
 	2)
 	echo "执行以下操作需要授权..."
-	sudo ss-apt-fast ssupdate
-       /opt/durapps/spark-store/bin/update-upgrade/ss-upgrade-list.sh
+	sudo aptss ssupdate
+    /opt/durapps/spark-store/bin/update-upgrade/ss-upgrade-list.sh
 	/opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade.sh
 	echo "---请按回车返回"
 	read

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

@@ -1,9 +1,19 @@
 #!/bin/bash
 set -e
-rm -rf /tmp/spark-store-updatenum/number
 LANG=en.US
 
-#!/bin/bash
+function notify-send() {
+    #Detect the name of the display in use
+    local display=":$(ls /tmp/.X11-unix/* | sed 's#/tmp/.X11-unix/X##' | head -n 1)"
+
+    #Detect the user using such display
+    local user=$(who | grep '('$display')' | awk '{print $1}' | head -n 1)
+
+    #Detect the id of the user
+    local uid=$(id -u $user)
+
+    sudo -u $user DISPLAY=$display DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$uid/bus notify-send "$@"
+}
 
 #检测网络链接畅通
 function network()
@@ -39,7 +49,7 @@ fi
 curl --progress-bar -o /opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list "https://gitee.com/deepin-community-store/repo_auto_update_script/raw/master/mirror-list-for-apt-fast/sources.list.d/sparkstore.list"
 # 每日更新星火源文件
 
-updatetext=`ss-apt-fast ssupdate`
+updatetext=`aptss ssupdate`
 
 
 mkdir -p /tmp/spark-store-updatenum/
@@ -47,14 +57,14 @@ mkdir -p /tmp/spark-store-updatenum/
 
 isupdate=`echo ${updatetext: -5}`
 if [ "$isupdate" = "date." ];then
-sudo echo "0" > /tmp/spark-store-updatenum/number
 exit 0 
 fi
 
 
 update_app_number=`echo ${updatetext%package*} #从右向左截取第一个 src 后的字符串`
 update_app_number=`echo ${update_app_number##*information...}`
-sudo echo "$update_app_number" > /tmp/spark-store-updatenum/number
 
-	
+
+notify-send -i spark-store "星火更新提醒" "星火商店仓库中有$update_app_number个软件包可以更新啦！请到星火商店的菜单处理"
+
 

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

@@ -1,28 +0,0 @@
-#!/bin/bash
-set -e
-isexistnumber=0
-if [ "$1" = "now" ];then
-	if [  -f /tmp/spark-store-updatenum/number ];then
-	update_app_number=`cat /tmp/spark-store-updatenum/number`
-	echo "$update_app_number"
-		if [ "$update_app_number" = "0" ];then
-		exit 0
-		fi
-	notify-send -i spark-store "星火更新提醒" "星火商店仓库中有$update_app_number个软件包可以更新啦！请到星火商店的菜单处理"
-	fi
-exit 0
-fi
-
-until [  $isexistnumber -eq 1 ];do
-if [  -f /tmp/spark-store-updatenum/number ];then
-	sleep 10
-	update_app_number=`cat /tmp/spark-store-updatenum/number`
-	echo "$update_app_number"
-		if [ "$update_app_number" = "0" ];then
-		exit 0
-		fi
-	notify-send -i spark-store "星火更新提醒" "星火商店仓库中有$update_app_number个软件包可以更新啦！请到星火商店的菜单处理"
-	isexistnumber=1
-fi
-sleep 10
-done

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

@@ -3,4 +3,4 @@ set -e
 
 
 echo "---可更新的应用有："
-bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt list --upgradable -o Dir::Etc::sourcelist="sources.list.d/sparkstore.list"     -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0"
+bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt list --upgradable -o Dir::Etc::sourcelist="sources.list.d/sparkstore.list"     -o Dir::Etc::sourceparts="-"   -o APT::Get::List-Cleanup="0"