busybox

ChaosConcerto · Jan 9, 2021 · f7c311f · f7c311f
1 parent f8c7d12
commit f7c311f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/manager.sh b/manager.sh
@@ -49,7 +49,7 @@ check_tmoe_command() {
 	else
 		TMOE_TIPS_01="tmoe"
 	fi
-	TMOE_TIPS_00="Welcome to tmoe linux manager v1.3971,type ${TMOE_TIPS_01} to start it."
+	TMOE_TIPS_00="Welcome to tmoe linux manager v1.3972,type ${TMOE_TIPS_01} to start it."
 }
 #########################
 tmoe_manager_env() {

diff --git a/share/container/install b/share/container/install
@@ -279,7 +279,7 @@ uncompress_other_format_file() {
 		fi
 	fi
 
-	if [[ ! -e "${DEBIAN_CHROOT}/usr/bin/env" ]]; then
+	if [[ ! -e "${DEBIAN_CHROOT}/usr/bin/env" && ! -e "${DEBIAN_CHROOT}/bin/busybox" ]]; then
 		if [ "${LINUX_DISTRO}" = "Android" ]; then
 			pv ${CURRENT_TMOE_DIR}/${TMOE_ROOTFS_TAR_XZ} | proot --link2symlink tar -px
 		else
@@ -316,7 +316,7 @@ uncompress_tar_gz_file() {
 		fi
 	fi
 
-	if [[ ! -e "${DEBIAN_CHROOT}/usr/bin/env" ]]; then
+	if [[ ! -e "${DEBIAN_CHROOT}/usr/bin/env" && ! -e "${DEBIAN_CHROOT}/bin/busybox" ]]; then
 		if [ "${LINUX_DISTRO}" = "Android" ]; then
 			pv ${CURRENT_TMOE_DIR}/${TMOE_ROOTFS_TAR_XZ} | proot --link2symlink tar -pzx
 		else
@@ -345,7 +345,7 @@ uncompress_tar_xz_file() {
 		check_tar_xz_pv
 	fi
 
-	if [[ ! -e "${DEBIAN_CHROOT}/usr/bin/env" ]]; then
+	if [[ ! -e "${DEBIAN_CHROOT}/usr/bin/env" && ! -e "${DEBIAN_CHROOT}/bin/busybox" ]]; then
 		if [ "${LINUX_DISTRO}" = "Android" ]; then
 			pv ${CURRENT_TMOE_DIR}/${TMOE_ROOTFS_TAR_XZ} | proot --link2symlink tar -pJx
 		else
@@ -368,7 +368,7 @@ uncompress_tar_zst_file() {
 		fi
 	fi
 
-	if [[ ! -e "${DEBIAN_CHROOT}/usr/bin/env" ]]; then
+	if [[ ! -e "${DEBIAN_CHROOT}/usr/bin/env" && ! -e "${DEBIAN_CHROOT}/bin/busybox" ]]; then
 		if [ "${LINUX_DISTRO}" = "Android" ]; then
 			pv ${CURRENT_TMOE_DIR}/${TMOE_ROOTFS_TAR_XZ} | proot --link2symlink tar -I zstd -px
 		else

diff --git a/tool.sh b/tool.sh
@@ -97,7 +97,7 @@ check_tmoe_command() {
 	else
 		TMOE_TIPS_01="tmoe t"
 	fi
-	TMOE_TIPS_00="Welcome to tmoe linux tool v1.3971,type ${TMOE_TIPS_01} to start this tool."
+	TMOE_TIPS_00="Welcome to tmoe linux tool v1.3972,type ${TMOE_TIPS_01} to start this tool."
 	#勿改00变量
 }
 #########

diff --git a/tools/gui/gui.sh b/tools/gui/gui.sh
@@ -901,7 +901,7 @@ configure_vnc_xstartup() {
     else
         printf "%s\n" "0ecb780817003d3342d16adb5ff1dfa9" >"/etc/machine-id"
     fi
-    cp -pv "/etc/machine-id" /var/lib/dbus/
+    ln -svf "/etc/machine-id" /var/lib/dbus/
     #fi
     case ${LINUX_DISTRO} in
     debian) [[ -e /usr/share/doc/fonts-noto-color-emoji ]] || apt install -y fonts-noto-color-emoji ;;

diff --git a/tools/gui/install_novnc b/tools/gui/install_novnc
@@ -90,7 +90,7 @@ check_python_novnc() {
 		if [ ! $(command -v websockify) ]; then
 			cd ${TMOE_LINUX_DIR}/novnc/utils/
 			if [ ! -d "websockify" ]; then
-				git clone git://github.com/novnc/websockify.git --depth=1 ./websockify || sudo git clone git://github.com/novnc/websockify.git --depth=1 ./websockify
+				git clone https://github.com/novnc/websockify.git --depth=1 ./websockify || sudo git clone git://github.com/novnc/websockify.git --depth=1 ./websockify
 			fi
 		fi
 	fi