From 5707007c7ab7306e8ae2e54722fb12e758bac909 Mon Sep 17 00:00:00 2001
From: gfdgd-xi <3025613752@qq.com>
Date: Mon, 26 Jun 2023 09:06:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E5=AE=9A=E7=A8=8B=E5=BA=A6=E4=BF=AE?=
=?UTF-8?q?=E5=A4=8D=E5=9B=BE=E6=A0=87=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
gx-env-load-desktop-in-chroot | 3 +++
gx-env-run | 5 +++++
gx-env-run-root | 7 ++++++-
3 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/gx-env-load-desktop-in-chroot b/gx-env-load-desktop-in-chroot
index 09aaa2c..e27fe64 100644
--- a/gx-env-load-desktop-in-chroot
+++ b/gx-env-load-desktop-in-chroot
@@ -29,6 +29,9 @@ for i in os.listdir("{}/usr/share/applications".format(chrootEnvPath)):
newInfo += "Exec=gx-env-run bash \"/gx-env/shell/gx-env-{}.sh\"\n".format(os.path.splitext(os.path.basename(i))[0])
elif "name=" in r.lower() or "name[" in r.lower():
newInfo += r + "(兼容模式)\n"
+ elif "icon=" in r.lower():
+ if os.path.exists(r[5:]):
+ newInfo += "Icon=/opt/new-system-env/" + r[5:] + "\n"
else:
newInfo += r + "\n"
print(newInfo)
diff --git a/gx-env-run b/gx-env-run
index f4047a2..378dc25 100755
--- a/gx-env-run
+++ b/gx-env-run
@@ -4,6 +4,11 @@ chrootEnvPath=/opt/new-system-env
# echo 请使用 root 权限运行
# exit 1
#fi
+echo aa > /tmp/env-$USER.txt
+if [[ ! -f $chrootEnvPath/tmp/env-$USER.txt ]]; then
+ echo 未挂载目录，立即挂载
+ pkexec gx-env-mount-root
+fi
command="$@"
#echo $command
pkexec env DISPLAY=$DISPLAY chroot $chrootEnvPath sudo -u $USER bash -c "$command"
diff --git a/gx-env-run-root b/gx-env-run-root
index bab188e..8d9e494 100755
--- a/gx-env-run-root
+++ b/gx-env-run-root
@@ -4,7 +4,12 @@ chrootEnvPath=/opt/new-system-env
# echo 请使用 root 权限运行
# exit 1
#fi
+echo aa > /tmp/env-$USER.txt
+if [[ ! -f $chrootEnvPath/tmp/env-$USER.txt ]]; then
+ echo 未挂载目录，立即挂载
+ sudo gx-env-mount-root
+fi
command="$@"
#echo $command
-sudo chroot $chrootEnvPath "$@"
+pkexec env DISPLAY=$DISPLAY chroot $chrootEnvPath "$@"
#echo $@
\ No newline at end of file