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