!179 4.1.2 正式版

Merge pull request !179 from shenmo/dev

DOCS/spk-doc.md

@@ -13,15 +13,15 @@
 
 | 分类名称 | web分类   　    |
 | -------- | -------------- |
-| 网络 | network        |
-| 社交 | chat           |
-| 音乐 | music          |
-| 视频 | video          |
-| 图像 | image_graphics       |
-| 游戏 | games          |
-| 办公 | office         |
-| 阅读 | reading        |
-| 开发 | development    |
-| 工具 | tools          |
-| 主题 | themes       |
-| 其他 | others         |
+| 网络应用 | network        |
+| 社交沟通 | chat           |
+| 音乐欣赏 | music          |
+| 视频播放 | video          |
+| 图形图像 | image_graphics       |
+| 游戏娱乐 | games          |
+| 办公学习 | office         |
+| 阅读翻译 | reading        |
+| 编程开发 | development    |
+| 系统工具 | tools          |
+| 主题美化 | themes       |
+| 其他应用 | others         |

DOCS/内网部署.md

@@ -1,7 +0,0 @@
-需要修改的内容：商店默认源位置，aptss获取apt-fast.conf和sparkstore.list的地址，ssinstall做安装检查的源位置
-
-服务器使用update.sh进行同步。
-
-为方便使用（其实是早期屎山使然），请将仓库放置于 `/home/ftp/spark-store`
-
-仓库管理相关代码请移步 [这里](https://gitee.com/deepin-community-store/repo_auto_update_script)，update.sh请联系 @shenmo 获取

debian/changelog

@@ -1,25 +1,6 @@
-spark-store (4.2~test2) stable; urgency=medium
-
-  * 修复: 420t1版本中ssinstall有时会重新下载软件包的问题
-  * 新增: 安装前会对软件包安装进行dry run以判断是否能正确安装
-  * 调整: aptss在进行任何操作前均检测是否存在包文件
-  * 调整: 修改apt-fast源代码以指定conf位置为/tmp/apt-fast,这部分不再使用bwrap模拟
-  * 新增: aptss检测Package文件支持分目录（目前指定为store）
-
- -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
-
-spark-store (4.2~test1) stable; urgency=medium
-
-  * 新增: aptss支持显示报错
-  * 新增: aptss部分提示汉化
-  * 修复: 修复部分情况下ssinstall实际未安装但是错误显示
-
- -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
-
 spark-store (4.1.2) stable; urgency=medium
 
   * feat: 初步的wayland支持
-  * feat: UOS下检测开发者模式是否开启，若未开启则拒绝安装
   * fix: 首页的捐赠页面在中文环境下显示中文
   * fix: 更新检测模块在aptss ssupdate操作失败后现在会正确地移除锁而不是错误的残留锁。
   * chore: ssinstall现在拒绝安装验证失败的包，审核操作现在需要改用ssaudit
@@ -48,8 +29,6 @@ spark-store (4.1.2) stable; urgency=medium
   * chore: 暂时去除没有意义的 DBus 接口，使用 DGuiApplicationHelper::newProcessInstance 获取新进程的启动参数
   * chore: 更新翻译文件，去除已经不存在的翻译
 
-
-
  -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
 
 spark-store (4.1.2~test2) stable; urgency=medium
@@ -63,7 +42,6 @@ spark-store (4.1.2~test2) stable; urgency=medium
 spark-store (4.1.2~test1) stable; urgency=medium
 
   * feat: 初步的wayland支持
-  * feat: UOS下检测开发者模式是否开启，若未开启则拒绝安装
   * fix: 首页的捐赠页面在中文环境下显示中文
   * fix: 更新检测模块在aptss ssupdate操作失败后现在会正确地移除锁而不是错误的残留锁。
   * chore: ssinstall现在拒绝安装验证失败的包，审核操作现在需要改用ssaudit

src/main.cpp

@@ -15,7 +15,7 @@ DWIDGET_USE_NAMESPACE
 int main(int argc, char *argv[])
 {
     // Get build time
-    static const QString version = "4.2~test2";
+    static const QString version = "4.1.2";
     static const QDate buildDate = QLocale(QLocale::English).toDate(QString(__DATE__).replace("  ", " 0"), "MMM dd yyyy");
     static const QTime buildTime = QTime::fromString(__TIME__, "hh:mm:ss");
     static const QString buildDateTime = buildDate.toString("yyyy.MM.dd") + "-" + buildTime.toString("hh:mm:ss");

tool/apt-fast/ss-apt-fast

@@ -161,8 +161,7 @@ VERBOSE_OUTPUT=
 _DOWNLOADER='aria2c --no-conf -c -j ${_MAXNUM} -x ${_MAXCONPERSRV} -s ${_SPLITCON} -i ${DLLIST} --min-split-size=${_MINSPLITSZ} --stream-piece-selector=${_PIECEALGO} --connect-timeout=600 --timeout=600 -m0'
 
 # Load config file.
-CONFFILE="/tmp/aptss-conf/apt-fast.conf"
-#### Spark Store apt-fast conf is in /tmp
+CONFFILE="/etc/apt-fast.conf"
 if [ -e "$CONFFILE" ]; then
     source "$CONFFILE"
 fi
@@ -208,9 +207,7 @@ fi
 msg_already_running()
 {
   msg "apt-fast already running!" "warning"
-  msg "apt-fast 已经在运行了" "warning"
   msg "Verify that all apt-fast processes are finished then remove $LCK_FILE.lock and try again." "hint"
-  msg "请确认所有的apt-fast进程已经结束，然后删除 $LCK_FILE.lock 后重试." "hint"
 }
 
 # Check if a lock file exists.
@@ -249,7 +246,6 @@ cleanup_dllist()
       if ! rm -f -- "$DLLIST" 2>/dev/null
       then
         msg "Could not clean up download list file." "warning"
-        msg "无法清除下载列表文件." "warning"
         CLEANUP_STATE=1
       fi
     fi
@@ -308,14 +304,12 @@ get_uris(){
     if ! mkdir -p -- "$(dirname "$DLLIST")"
     then
       msg "Could not create download file directory." "warning"
-      msg "无法创建下载文件夹" "warning"
       exit 1
     fi
   elif [ -f "$DLLIST" ]; then
     if ! rm -f -- "$DLLIST" 2>/dev/null && ! touch -- "$DLLIST" 2>/dev/null
     then
-      msg "Unable to write to download file. Try restarting with root permissions or run 'aptss clean' first." "warning"
-      msg "无法下载文件。尝试使用root权限，或者运行 'aptss clean'" "warning"
+      msg "Unable to write to download file. Try restarting with root permissions or run 'apt-fast clean' first." "warning"
       exit 1
     fi
   fi
@@ -324,19 +318,15 @@ get_uris(){
   echo "# apt-fast mirror list: $(date)" > "$DLLIST"
   #NOTE: aptitude doesn't have this functionality, so we use apt-get to get
   #      package URIs.
-#  case "$_APTMGR" in
-#    apt|apt-get) uri_mgr=$_APTMGR;;
-#    *) uri_mgr=apt-get;;
-#  esac
-  # NOTE:apt可能出现变动，不建议在脚本中使用，因此在此统一改用apt-get
-uri_mgr=apt-get
+  case "$_APTMGR" in
+    apt|apt-get) uri_mgr=$_APTMGR;;
+    *) uri_mgr=apt-get;;
+  esac
   uris_full="$("$uri_mgr" "${APT_SCRIPT_WARNING[@]}" -y --print-uris "$@")"
   uris_full_ret="$?"
   if [ "$uris_full_ret" -ne 0 ]
   then
-    msg "Package manager quit with exit code.Here is the log" "warning"
-    msg "包管理器以错误代码退出.日志如下" "warning"
-    msg "${uris_full}"
+    msg "Package manager quit with exit code." "warning"
     exit "$uris_full_ret"
   fi
   while read -r pkg_uri_info
@@ -406,7 +396,6 @@ uri_mgr=apt-get
           checksum="$(echo "$patch_checksum" | cut -d' ' -f2)"
         else
           msg "Couldn't get supported checksum for $pkg_name ($pkg_version)." "warning"
-	  msg "无法获得 $pkg_name ($pkg_version) 的受支持的散列验证值" "warning"
           REMOVE_WORKING_MESSAGE=
         fi
       fi
@@ -445,7 +434,6 @@ display_downloadfile(){
     done <<<"$(echo -e "$DOWNLOAD_DISPLAY" | sort "${DISPLAY_SORT_OPTIONS[@]}")"
   fi
   msg "Download size: $(echo "$DOWNLOAD_SIZE" | numfmt --to=iec-i --suffix=B)" "normal"
-  msg "下载大小: $(echo "$DOWNLOAD_SIZE" | numfmt --to=iec-i --suffix=B)" "normal"
 }
 
 # Create and insert a PID number to lockfile.
@@ -489,7 +477,6 @@ if [ "$CMD" == "aria2c" ]; then
   done
   if [ -z "$HASH_SUPPORTED" ]; then
     msg "Couldn't find supported checksum algorithm from aria2c. Checksums disabled." "warning"
-    msg "无法找到aria2c支持的散列验证算法. 散列验证已被禁用." "warning"
   fi
 fi
 
@@ -544,7 +531,6 @@ fi
 if [ "$option" == "install" ]; then
   msg
   msg "Working... this may take a while." "normal"
-  msg "正在工作中，请稍等" "normal"
   REMOVE_WORKING_MESSAGE=y
 
   get_uris "$@"
@@ -612,7 +598,6 @@ elif [ "$option" == "clean" ]; then
 elif [ "$option" == "download" ]; then
   msg
   msg "Working... this may take a while." "normal"
-  msg "正在工作中，请稍等" "normal"
   REMOVE_WORKING_MESSAGE=y
 
   get_uris "$@"
@@ -631,7 +616,6 @@ elif [ "$option" == "download" ]; then
 elif [ "$option" == "source" ]; then
   msg
   msg "Working... this may take a while." "normal"
-  msg "正在工作中，请稍等" "normal"
   REMOVE_WORKING_MESSAGE=y
 
   get_uris "$@"

tool/aptss

@@ -14,39 +14,42 @@ chmod -R 755 /tmp/aptss-conf
 fi
 
 
-if [ ! -e "/var/lib/apt/lists/d.store.deepinos.org.cn_Packages" ] && [ ! -e "/var/lib/apt/lists/d.store.deepinos.org.cn_store_Packages" ];then
-echo "接收星火仓库软件信息中..."
-aptss ssupdate
-fi
-
-SS_APT_FAST="/opt/durapps/spark-store/bin/apt-fast/ss-apt-fast"
-
 
 
 if  [ "$1" = "install" ] || [ "$1" = "upgrade" ] || [ "$1" = "full-upgrade" ] ; then
 
-
+if [ ! -e "/var/lib/apt/lists/d.store.deepinos.org.cn_Packages" ];then
+echo "接收星火仓库软件信息中..."
+aptss ssupdate
+fi
 
 ###执行
 bwrap --dev-bind / / \
+                   --bind '/tmp/aptss-conf/apt-fast.conf' /etc/apt-fast.conf \
                    --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list \
-                ${SS_APT_FAST} "$@" --allow-downgrades 
+                /opt/durapps/spark-store/bin/apt-fast/ss-apt-fast "$@" --allow-downgrades 
 
 
 elif [ "$1" = "download" ];then
 
 ###执行
 bwrap --dev-bind / / \
+                   --bind '/tmp/aptss-conf/apt-fast.conf' /etc/apt-fast.conf \
                    --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list \
-                ${SS_APT_FAST} "$@" --allow-downgrades 
+                /opt/durapps/spark-store/bin/apt-fast/ss-apt-fast "$@" --allow-downgrades 
 
 
 elif [ "$1" = "policy" ] || [ "$1" = "search" ];then
 
 
+if [ ! -e "/var/lib/apt/lists/d.store.deepinos.org.cn_Packages" ];then
+echo "接收星火仓库软件信息中..."
+aptss ssupdate
+fi
 
 ###执行
 bwrap --dev-bind / / \
+                   --bind '/tmp/aptss-conf/apt-fast.conf' /etc/apt-fast.conf \
                    --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list \
                 apt "$@" 
 

tool/ssaudit

@@ -28,17 +28,6 @@ fi
 DEBPATH=`realpath $1`
 
 echo  ----------------------------------------------------------------------------------
-try_run_output=$(aptss --dry-run install $DEBPATH)
-try_run_ret="$?"
-
-  if [ "$try_run_ret" -ne 0 ]
-  then
-    echo "Package manager quit with exit code.Here is the log" 
-    echo "包管理器以错误代码退出.日志如下" 
-    echo 
-    echo -e "${try_run_output}"
-    exit "$try_run_ret"
-  fi
-dpkg -i  "$DEBPATH"  || aptss install -yf 
+dpkg -i "$DEBPATH" || aptss install -yf 
 
 

tool/ssinstall

@@ -78,20 +78,7 @@ if [ ! -z "$IS_MD5SUM_CHECKD" ];then
 
 echo "校验成功，开始安装"
 echo  ----------------------------------------------------------------------------------
-try_run_output=$(aptss --dry-run install $DEBPATH)
-try_run_ret="$?"
-
-  if [ "$try_run_ret" -ne 0 ]
-  then
-    echo "Package manager quit with exit code.Here is the log" 
-    echo "包管理器以错误代码退出.日志如下" 
-    echo
-    echo -e "${try_run_output}"
-    exit "$try_run_ret"
-  fi
-
-
-dpkg -i  "$DEBPATH"  || aptss install -yf 
+dpkg -i "$DEBPATH" || aptss install -yf 
 
 else