From 329a783374e0212fa03250ea645bcfd5d0cf7448 Mon Sep 17 00:00:00 2001 From: RX6900XT Date: Mon, 26 Dec 2022 01:19:53 +0000 Subject: [PATCH 01/14] postinst and prerm Signed-off-by: RX6900XT --- spark-dwine-launch/postinst | 55 +++++++++++++++++++++++++++++++++++++ spark-dwine-launch/prerm | 17 ++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 spark-dwine-launch/postinst create mode 100644 spark-dwine-launch/prerm diff --git a/spark-dwine-launch/postinst b/spark-dwine-launch/postinst new file mode 100644 index 0000000..3414960 --- /dev/null +++ b/spark-dwine-launch/postinst @@ -0,0 +1,55 @@ +#!/bin/bash + +PACK_NAME="deepin.com.baidu.pan" +CONTAINER_NAME="Deepin-BaiduNetDisk" +MIME_TYPE="" +ACTIVEX_NAME="" +MAKE_AUTOSTART="" +SEND_TO_DESKTOP="" + + +make_autostart() +{ + for file in $(ls /home) + do + if [ -d "/home/$file/.config/autostart" ] + then + cp /opt/apps/deepin.com.baidu.pan/entries/applications/${PACK_NAME}.desktop /home/$file/.config/autostart/ + sed -i "s#%u#\"autostart\"#" /home/$file/.config/autostart/${PACK_NAME}.desktop + fi + done +} + +send_to_desktop() +{ + for file in $(ls /home) + do + if [ -d "/home/$file/.config/autostart" ] + then + desktop=$(cat /etc/xdg/user-dirs.defaults | grep DESKTOP | awk -F= '{print $2}') + if [ -d "/home/$file/$desktop" ]; then + cp /opt/apps/deepin.com.baidu.pan/entries/applications/${PACK_NAME}*.desktop /home/$file/$desktop + fi + fi + done +} + +if [ -n "$MAKE_AUTOSTART" ]; then + make_autostart +fi + +if [ -n "$SEND_TO_DESKTOP" ]; then + send_to_desktop +fi + +if [ -n "$ACTIVEX_NAME" ]; then + if [ ! -d "/usr/lib/mozilla/plugins" ];then + mkdir -p /usr/lib/mozilla/plugins + fi + cp /usr/local/share/pipelight/libpipelight.so /usr/lib/mozilla/plugins/libpipelight-${ACTIVEX_NAME}.so +fi + +# Make sure the script returns 0 +true + + diff --git a/spark-dwine-launch/prerm b/spark-dwine-launch/prerm new file mode 100644 index 0000000..fceae7b --- /dev/null +++ b/spark-dwine-launch/prerm @@ -0,0 +1,17 @@ +#!/bin/sh + +PACK_NAME="deepin.com.baidu.pan" +CONTAINER_NAME="Deepin-BaiduNetDisk" +MIME_TYPE="" +ACTIVEX_NAME="" +MAKE_AUTOSTART="" +SEND_TO_DESKTOP="" + +if [ -n "$MIME_TYPE" ]; then + /opt/apps/$PACK_NAME/files/unregister_mimetype +fi + +# Make sure the script returns 0 +true + + -- Gitee From b8fa265cb72bbc8c841bc3ece24e47c23d7fa605 Mon Sep 17 00:00:00 2001 From: RX6900XT Date: Mon, 26 Dec 2022 01:20:29 +0000 Subject: [PATCH 02/14] =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=20spark-dwine?= =?UTF-8?q?-launch/postinst=20=E7=82=BA=20spark-dwine-launch/postinst=5Fte?= =?UTF-8?q?mplate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- spark-dwine-launch/{postinst => postinst_template} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename spark-dwine-launch/{postinst => postinst_template} (100%) diff --git a/spark-dwine-launch/postinst b/spark-dwine-launch/postinst_template similarity index 100% rename from spark-dwine-launch/postinst rename to spark-dwine-launch/postinst_template -- Gitee From 52f5d1a6af4ebfee704bfad02238dee05c95e8c7 Mon Sep 17 00:00:00 2001 From: RX6900XT Date: Mon, 26 Dec 2022 01:22:41 +0000 Subject: [PATCH 03/14] update spark-dwine-launch/postinst_template. Signed-off-by: RX6900XT --- spark-dwine-launch/postinst_template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spark-dwine-launch/postinst_template b/spark-dwine-launch/postinst_template index 3414960..9584a14 100644 --- a/spark-dwine-launch/postinst_template +++ b/spark-dwine-launch/postinst_template @@ -1,7 +1,7 @@ #!/bin/bash -PACK_NAME="deepin.com.baidu.pan" -CONTAINER_NAME="Deepin-BaiduNetDisk" +PACK_NAME="" +CONTAINER_NAME="" MIME_TYPE="" ACTIVEX_NAME="" MAKE_AUTOSTART="" @@ -14,7 +14,7 @@ make_autostart() do if [ -d "/home/$file/.config/autostart" ] then - cp /opt/apps/deepin.com.baidu.pan/entries/applications/${PACK_NAME}.desktop /home/$file/.config/autostart/ + cp /opt/apps/$PACK_NAME/entries/applications/${PACK_NAME}.desktop /home/$file/.config/autostart/ sed -i "s#%u#\"autostart\"#" /home/$file/.config/autostart/${PACK_NAME}.desktop fi done @@ -28,7 +28,7 @@ send_to_desktop() then desktop=$(cat /etc/xdg/user-dirs.defaults | grep DESKTOP | awk -F= '{print $2}') if [ -d "/home/$file/$desktop" ]; then - cp /opt/apps/deepin.com.baidu.pan/entries/applications/${PACK_NAME}*.desktop /home/$file/$desktop + cp /opt/apps/$PACK_NAME/entries/applications/${PACK_NAME}*.desktop /home/$file/$desktop fi fi done -- Gitee From 308270ddee3179be903b4ce9771f06b1f4073989 Mon Sep 17 00:00:00 2001 From: RX6900XT Date: Mon, 26 Dec 2022 01:23:31 +0000 Subject: [PATCH 04/14] =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=20spark-dwine?= =?UTF-8?q?-launch/prerm=20=E7=82=BA=20spark-dwine-launch/prerm=5Ftemplate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- spark-dwine-launch/{prerm => prerm_template} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename spark-dwine-launch/{prerm => prerm_template} (100%) diff --git a/spark-dwine-launch/prerm b/spark-dwine-launch/prerm_template similarity index 100% rename from spark-dwine-launch/prerm rename to spark-dwine-launch/prerm_template -- Gitee From a615900805824f07e6c9409065672b48d3bfe34b Mon Sep 17 00:00:00 2001 From: RX6900XT Date: Mon, 26 Dec 2022 01:24:10 +0000 Subject: [PATCH 05/14] update spark-dwine-launch/prerm_template. Signed-off-by: RX6900XT --- spark-dwine-launch/prerm_template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spark-dwine-launch/prerm_template b/spark-dwine-launch/prerm_template index fceae7b..4e0e75e 100644 --- a/spark-dwine-launch/prerm_template +++ b/spark-dwine-launch/prerm_template @@ -1,7 +1,7 @@ #!/bin/sh -PACK_NAME="deepin.com.baidu.pan" -CONTAINER_NAME="Deepin-BaiduNetDisk" +PACK_NAME="" +CONTAINER_NAME="" MIME_TYPE="" ACTIVEX_NAME="" MAKE_AUTOSTART="" -- Gitee From f7d7bfe2410b9b8629c0858e88c24e99b9243b49 Mon Sep 17 00:00:00 2001 From: RX6900XT Date: Mon, 26 Dec 2022 01:27:14 +0000 Subject: [PATCH 06/14] update spark-dwine-launch/postrm_template. Signed-off-by: RX6900XT --- spark-dwine-launch/postrm_template | 43 ++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/spark-dwine-launch/postrm_template b/spark-dwine-launch/postrm_template index 3a79e67..25fbc11 100644 --- a/spark-dwine-launch/postrm_template +++ b/spark-dwine-launch/postrm_template @@ -3,6 +3,49 @@ if [ "$1" = "remove" ] || [ "$1" = "purge" ];then echo "清理卸载残留" CONTAINER_NAME="" +PACK_NAME="" +MIME_TYPE="" +ACTIVEX_NAME="" +MAKE_AUTOSTART="" +SEND_TO_DESKTOP="" + +make_autostart() +{ + for file in $(ls /home) + do + if [ -d "/home/$file/.config/autostart" ] + then + rm /home/$file/.config/autostart/${PACK_NAME}.desktop + fi + done +} + +send_to_desktop() +{ + for file in $(ls /home) + do + if [ -d "/home/$file/.config/autostart" ] + then + desktop=$(cat /etc/xdg/user-dirs.defaults | grep DESKTOP | awk -F= '{print $2}') + if [ -d "/home/$file/$desktop" ]; then + rm /home/$file/$desktop/${PACK_NAME}*.desktop + fi + fi + done +} + +if [ -n "$MAKE_AUTOSTART" ]; then + make_autostart +fi + +if [ -n "$SEND_TO_DESKTOP" ]; then + send_to_desktop +fi + +if [ -n "$ACTIVEX_NAME" ]; then + rm /usr/lib/mozilla/plugins/libpipelight-${ACTIVEX_NAME}.so +fi + if [ -z $CONTAINER_NAME ];then echo "W: 没有指定容器，跳过清理容器。请手动前往 ~/.deepinwine/ 下删除" -- Gitee From 806da4f51b35f4dcd326060d412c06a45be69cba Mon Sep 17 00:00:00 2001 From: RX6900XT Date: Tue, 27 Dec 2022 05:37:44 +0000 Subject: [PATCH 07/14] update spark-dwine-launch/prerm_template. Signed-off-by: RX6900XT --- spark-dwine-launch/prerm_template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spark-dwine-launch/prerm_template b/spark-dwine-launch/prerm_template index 4e0e75e..4ad52b4 100644 --- a/spark-dwine-launch/prerm_template +++ b/spark-dwine-launch/prerm_template @@ -1,7 +1,7 @@ #!/bin/sh PACK_NAME="" -CONTAINER_NAME="" +BOTTLE_NAME="" MIME_TYPE="" ACTIVEX_NAME="" MAKE_AUTOSTART="" -- Gitee From 6e21ae24a4e90a5e482fb73c31c77a680199e510 Mon Sep 17 00:00:00 2001 From: RX6900XT Date: Tue, 27 Dec 2022 05:46:56 +0000 Subject: [PATCH 08/14] update spark-dwine-launch/postrm_template. Signed-off-by: RX6900XT --- spark-dwine-launch/postrm_template | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/spark-dwine-launch/postrm_template b/spark-dwine-launch/postrm_template index 25fbc11..e1b2d4d 100644 --- a/spark-dwine-launch/postrm_template +++ b/spark-dwine-launch/postrm_template @@ -2,8 +2,8 @@ if [ "$1" = "remove" ] || [ "$1" = "purge" ];then echo "清理卸载残留" -CONTAINER_NAME="" -PACK_NAME="" +BOTTLE_NAME="" #容器名 +PACK_NAME="" #软体套件名 MIME_TYPE="" ACTIVEX_NAME="" MAKE_AUTOSTART="" @@ -13,9 +13,9 @@ make_autostart() { for file in $(ls /home) do - if [ -d "/home/$file/.config/autostart" ] + if [ -d "/home/${USER}/.config/autostart" ] then - rm /home/$file/.config/autostart/${PACK_NAME}.desktop + rm /home/${USER}/.config/autostart/${PACK_NAME}.desktop fi done } @@ -24,11 +24,11 @@ send_to_desktop() { for file in $(ls /home) do - if [ -d "/home/$file/.config/autostart" ] + if [ -d "/home/${USER}/.config/autostart" ] then desktop=$(cat /etc/xdg/user-dirs.defaults | grep DESKTOP | awk -F= '{print $2}') - if [ -d "/home/$file/$desktop" ]; then - rm /home/$file/$desktop/${PACK_NAME}*.desktop + if [ -d "/home/${USER}/$desktop" ]; then + rm /home/${USER}/$desktop/${PACK_NAME}*.desktop fi fi done @@ -47,22 +47,22 @@ if [ -n "$ACTIVEX_NAME" ]; then fi -if [ -z $CONTAINER_NAME ];then +if [ -z $BOTTLE_NAME ];then echo "W: 没有指定容器，跳过清理容器。请手动前往 ~/.deepinwine/ 下删除" exit fi if [ -e /opt/deepinwine/tools/kill.sh ];then -/opt/deepinwine/tools/kill.sh $CONTAINER_NAME -###这里注意，如果没写CONTAINER_NAME,会把QQ杀了 +/opt/deepinwine/tools/kill.sh $BOTTLE_NAME +###这里注意，如果没写BOTTLE_NAME,会把QQ杀了 fi for username in $(ls /home) do echo /home/$username - if [ -d /home/$username/.deepinwine/$CONTAINER_NAME ] + if [ -d /home/$username/.deepinwine/$BOTTLE_NAME ] then - rm -rf /home/$username/.deepinwine/$CONTAINER_NAME + rm -rf /home/$username/.deepinwine/$BOTTLE_NAME fi done else -- Gitee From 25abbb29b67d246503f19d6290026bc6367d0cde Mon Sep 17 00:00:00 2001 From: RX6900XT Date: Tue, 27 Dec 2022 05:53:17 +0000 Subject: [PATCH 09/14] update spark-dwine-launch/postinst_template. Signed-off-by: RX6900XT --- spark-dwine-launch/postinst_template | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/spark-dwine-launch/postinst_template b/spark-dwine-launch/postinst_template index 9584a14..9b17908 100644 --- a/spark-dwine-launch/postinst_template +++ b/spark-dwine-launch/postinst_template @@ -1,7 +1,7 @@ #!/bin/bash -PACK_NAME="" -CONTAINER_NAME="" +PACK_NAME="" #软体套件名 +BOTTLE_NAME="" #容器名 MIME_TYPE="" ACTIVEX_NAME="" MAKE_AUTOSTART="" @@ -12,10 +12,10 @@ make_autostart() { for file in $(ls /home) do - if [ -d "/home/$file/.config/autostart" ] + if [ -d "/home/${USER}/.config/autostart" ] then - cp /opt/apps/$PACK_NAME/entries/applications/${PACK_NAME}.desktop /home/$file/.config/autostart/ - sed -i "s#%u#\"autostart\"#" /home/$file/.config/autostart/${PACK_NAME}.desktop + cp /opt/apps/$PACK_NAME/entries/applications/${PACK_NAME}.desktop /home/${USER}/.config/autostart/ + sed -i "s#%u#\"autostart\"#" /home/${USER}/.config/autostart/${PACK_NAME}.desktop fi done } @@ -24,11 +24,11 @@ send_to_desktop() { for file in $(ls /home) do - if [ -d "/home/$file/.config/autostart" ] + if [ -d "/home/${USER}/.config/autostart" ] then desktop=$(cat /etc/xdg/user-dirs.defaults | grep DESKTOP | awk -F= '{print $2}') - if [ -d "/home/$file/$desktop" ]; then - cp /opt/apps/$PACK_NAME/entries/applications/${PACK_NAME}*.desktop /home/$file/$desktop + if [ -d "/home/${USER}/$desktop" ]; then + cp /opt/apps/$PACK_NAME/entries/applications/${PACK_NAME}*.desktop /home/${USER}/$desktop fi fi done -- Gitee From 2d347d3be335fe1ed5582daff01b1ceeac393859 Mon Sep 17 00:00:00 2001 From: RX6900XT Date: Tue, 27 Dec 2022 05:56:17 +0000 Subject: [PATCH 10/14] update spark-dwine-launch/prerm_template. Signed-off-by: RX6900XT --- spark-dwine-launch/prerm_template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spark-dwine-launch/prerm_template b/spark-dwine-launch/prerm_template index 4ad52b4..f2befce 100644 --- a/spark-dwine-launch/prerm_template +++ b/spark-dwine-launch/prerm_template @@ -1,8 +1,8 @@ #!/bin/sh -PACK_NAME="" -BOTTLE_NAME="" -MIME_TYPE="" +PACK_NAME="" #软体套件名 +BOTTLE_NAME="" #容器名 +MIME_TYPE="" ACTIVEX_NAME="" MAKE_AUTOSTART="" SEND_TO_DESKTOP="" -- Gitee From a09f65944cf6d402f9c4e11a8bb99a73a259f90f Mon Sep 17 00:00:00 2001 From: RX6900XT Date: Tue, 27 Dec 2022 06:29:34 +0000 Subject: [PATCH 11/14] update spark-dwine-launch/postinst_template. Signed-off-by: RX6900XT --- spark-dwine-launch/postinst_template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/spark-dwine-launch/postinst_template b/spark-dwine-launch/postinst_template index 9b17908..ac131fd 100644 --- a/spark-dwine-launch/postinst_template +++ b/spark-dwine-launch/postinst_template @@ -4,8 +4,8 @@ PACK_NAME="" #软体套件名 BOTTLE_NAME="" #容器名 MIME_TYPE="" ACTIVEX_NAME="" -MAKE_AUTOSTART="" -SEND_TO_DESKTOP="" +MAKE_AUTOSTART="" #开机时自动执行，需要实现请填写1 +SEND_TO_DESKTOP="" #将启动图示从工作管理员copy至系统桌面，需要实现请填写1 make_autostart() @@ -14,8 +14,8 @@ make_autostart() do if [ -d "/home/${USER}/.config/autostart" ] then - cp /opt/apps/$PACK_NAME/entries/applications/${PACK_NAME}.desktop /home/${USER}/.config/autostart/ - sed -i "s#%u#\"autostart\"#" /home/${USER}/.config/autostart/${PACK_NAME}.desktop + cp /opt/apps/$PACK_NAME/entries/applications/$PACK_NAME.desktop /home/${USER}/.config/autostart/ + sed -i "s#%u#\"autostart\"#" /home/${USER}/.config/autostart/$PACK_NAME.desktop fi done } @@ -28,7 +28,7 @@ send_to_desktop() then desktop=$(cat /etc/xdg/user-dirs.defaults | grep DESKTOP | awk -F= '{print $2}') if [ -d "/home/${USER}/$desktop" ]; then - cp /opt/apps/$PACK_NAME/entries/applications/${PACK_NAME}*.desktop /home/${USER}/$desktop + cp /opt/apps/$PACK_NAME/entries/applications/$PACK_NAME*.desktop /home/${USER}/$desktop fi fi done @@ -46,7 +46,7 @@ if [ -n "$ACTIVEX_NAME" ]; then if [ ! -d "/usr/lib/mozilla/plugins" ];then mkdir -p /usr/lib/mozilla/plugins fi - cp /usr/local/share/pipelight/libpipelight.so /usr/lib/mozilla/plugins/libpipelight-${ACTIVEX_NAME}.so + cp /usr/local/share/pipelight/libpipelight.so /usr/lib/mozilla/plugins/libpipelight-$ACTIVEX_NAME.so fi # Make sure the script returns 0 -- Gitee From 069d0630315bb4f82a632512574e302791d3750e Mon Sep 17 00:00:00 2001 From: RX6900XT Date: Tue, 27 Dec 2022 06:31:10 +0000 Subject: [PATCH 12/14] update spark-dwine-launch/postrm_template. Signed-off-by: RX6900XT --- spark-dwine-launch/postrm_template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/spark-dwine-launch/postrm_template b/spark-dwine-launch/postrm_template index e1b2d4d..1c26d1a 100644 --- a/spark-dwine-launch/postrm_template +++ b/spark-dwine-launch/postrm_template @@ -6,8 +6,8 @@ BOTTLE_NAME="" #容器名 PACK_NAME="" #软体套件名 MIME_TYPE="" ACTIVEX_NAME="" -MAKE_AUTOSTART="" -SEND_TO_DESKTOP="" +MAKE_AUTOSTART="" #开机时自动执行，需要实现请填写1 +SEND_TO_DESKTOP="" #将启动图示从工作管理员copy至系统桌面，需要实现请填写1 make_autostart() { @@ -15,7 +15,7 @@ make_autostart() do if [ -d "/home/${USER}/.config/autostart" ] then - rm /home/${USER}/.config/autostart/${PACK_NAME}.desktop + rm /home/${USER}/.config/autostart/$PACK_NAME.desktop fi done } @@ -28,7 +28,7 @@ send_to_desktop() then desktop=$(cat /etc/xdg/user-dirs.defaults | grep DESKTOP | awk -F= '{print $2}') if [ -d "/home/${USER}/$desktop" ]; then - rm /home/${USER}/$desktop/${PACK_NAME}*.desktop + rm /home/${USER}/$desktop/$PACK_NAME*.desktop fi fi done @@ -43,7 +43,7 @@ if [ -n "$SEND_TO_DESKTOP" ]; then fi if [ -n "$ACTIVEX_NAME" ]; then - rm /usr/lib/mozilla/plugins/libpipelight-${ACTIVEX_NAME}.so + rm /usr/lib/mozilla/plugins/libpipelight-$ACTIVEX_NAME.so fi -- Gitee From 5f6c06233575333f2364877052ef1fdbeab0b51e Mon Sep 17 00:00:00 2001 From: RX6900XT Date: Tue, 27 Dec 2022 06:36:57 +0000 Subject: [PATCH 13/14] update spark-dwine-launch/postinst_template. Signed-off-by: RX6900XT --- spark-dwine-launch/postinst_template | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/spark-dwine-launch/postinst_template b/spark-dwine-launch/postinst_template index ac131fd..76fa7bd 100644 --- a/spark-dwine-launch/postinst_template +++ b/spark-dwine-launch/postinst_template @@ -10,25 +10,27 @@ SEND_TO_DESKTOP="" #将启动图示从工作管理员copy至系统桌面，需 make_autostart() { - for file in $(ls /home) + for username in $(ls /home) do - if [ -d "/home/${USER}/.config/autostart" ] + echo /home/$username + if [ -d "/home/$username/.config/autostart" ] then - cp /opt/apps/$PACK_NAME/entries/applications/$PACK_NAME.desktop /home/${USER}/.config/autostart/ - sed -i "s#%u#\"autostart\"#" /home/${USER}/.config/autostart/$PACK_NAME.desktop + cp /opt/apps/$PACK_NAME/entries/applications/$PACK_NAME.desktop /home/$username/.config/autostart/ + sed -i "s#%u#\"autostart\"#" /home/$username/.config/autostart/$PACK_NAME.desktop fi done } send_to_desktop() { - for file in $(ls /home) + for username in $(ls /home) do - if [ -d "/home/${USER}/.config/autostart" ] + echo /home/$username + if [ -d "/home/$username/.config/autostart" ] then desktop=$(cat /etc/xdg/user-dirs.defaults | grep DESKTOP | awk -F= '{print $2}') - if [ -d "/home/${USER}/$desktop" ]; then - cp /opt/apps/$PACK_NAME/entries/applications/$PACK_NAME*.desktop /home/${USER}/$desktop + if [ -d "/home/$username/$desktop" ]; then + cp /opt/apps/$PACK_NAME/entries/applications/$PACK_NAME*.desktop /home/$username/$desktop fi fi done -- Gitee From 5c03d17353f38703ef3dc134a01c84a1cef482d4 Mon Sep 17 00:00:00 2001 From: RX6900XT Date: Tue, 27 Dec 2022 06:38:29 +0000 Subject: [PATCH 14/14] update spark-dwine-launch/postrm_template. Signed-off-by: RX6900XT --- spark-dwine-launch/postrm_template | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/spark-dwine-launch/postrm_template b/spark-dwine-launch/postrm_template index 1c26d1a..836aef6 100644 --- a/spark-dwine-launch/postrm_template +++ b/spark-dwine-launch/postrm_template @@ -11,24 +11,26 @@ SEND_TO_DESKTOP="" #将启动图示从工作管理员copy至系统桌面，需 make_autostart() { - for file in $(ls /home) +for username in $(ls /home) do - if [ -d "/home/${USER}/.config/autostart" ] + echo /home/$username + if [ -d "/home/$username/.config/autostart" ] then - rm /home/${USER}/.config/autostart/$PACK_NAME.desktop + rm /home/$username/.config/autostart/$PACK_NAME.desktop fi done } send_to_desktop() { - for file in $(ls /home) + for username in $(ls /home) do - if [ -d "/home/${USER}/.config/autostart" ] + echo /home/$username + if [ -d "/home/$username/.config/autostart" ] then desktop=$(cat /etc/xdg/user-dirs.defaults | grep DESKTOP | awk -F= '{print $2}') - if [ -d "/home/${USER}/$desktop" ]; then - rm /home/${USER}/$desktop/$PACK_NAME*.desktop + if [ -d "/home/$username/$desktop" ]; then + rm /home/$username/$desktop/$PACK_NAME*.desktop fi fi done -- Gitee