fix user create issue in distro container, fix update pause issue

sabamdarif · Nov 8, 2024 · 59c9efe · 59c9efe
1 parent 962e8e8
commit 59c9efe
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 25 deletions.
diff --git a/distro-container-setup b/distro-container-setup
@@ -290,8 +290,7 @@ proot-distro login $selected_distro -- /bin/bash -c 'bash pd_basic_setup.sh'
     final_pass="root"
     fi
 
-if [[ "$pd_pass_type" == "1" ]];then
-    if [[ "$selected_distro" == "alpine" ]]; then
+if [[ "$selected_distro" == "alpine" ]]; then
 cat <<EOF > $distro_path/root/useradd.sh
 #!/bin/bash
 
@@ -300,57 +299,44 @@ groupadd wheel
 mkdir -p /home/$final_user_name
 adduser -h /home/$final_user_name -s \$(which bash) -G users -D $final_user_name
 chown ${final_user_name}:users /home/$final_user_name
-chmod u+rw /etc/sudoers
-echo "$final_user_name ALL=(ALL) NOPASSWD:ALL" | tee -a /etc/sudoers > /dev/null 2>&1
-chmod u-w /etc/sudoers
+echo "${final_user_name}:${final_pass}" | chpasswd
 rm useradd.sh
 EOF
-    else
+else
 cat <<EOF > $distro_path/root/useradd.sh
 #!/bin/bash
 
 groupadd storage
 groupadd wheel
 useradd -m -g users -s \$(which bash) ${final_user_name}
 usermod -aG wheel,polkitd,audio,video,storage ${final_user_name}
-chmod u+rw /etc/sudoers
-echo "$final_user_name ALL=(ALL) NOPASSWD:ALL" | tee -a /etc/sudoers > /dev/null 2>&1
-chmod u-w /etc/sudoers
+echo "${final_user_name}:${final_pass}" | chpasswd
 rm useradd.sh
 EOF
-    fi
 fi
 
-if [[ "$selected_distro" == "alpine" ]]; then
+proot-distro login $selected_distro -- /bin/sh -c 'bash useradd.sh'
+
+if [[ "$pd_pass_type" == "1" ]];then
 cat <<EOF > $distro_path/root/useradd.sh
 #!/bin/bash
 
-groupadd storage
-groupadd wheel
-mkdir -p /home/$final_user_name
-adduser -h /home/$final_user_name -s \$(which bash) -G users -D $final_user_name
-chown ${final_user_name}:users /home/$final_user_name
-echo "${final_user_name}:${final_pass}" | chpasswd
 chmod u+rw /etc/sudoers
-echo "$final_user_name ALL=(ALL:ALL) ALL" | tee -a /etc/sudoers > /dev/null 2>&1
+echo "$final_user_name ALL=(ALL) NOPASSWD:ALL" | tee -a /etc/sudoers > /dev/null 2>&1
 chmod u-w /etc/sudoers
 rm useradd.sh
-EOF
-else
+EOF 
+elif [[ "$pd_pass_type" == "2" ]];then
 cat <<EOF > $distro_path/root/useradd.sh
 #!/bin/bash
 
-groupadd storage
-groupadd wheel
-useradd -m -g users -s \$(which bash) ${final_user_name}
-usermod -aG wheel,polkitd,audio,video,storage ${final_user_name}
-echo "${final_user_name}:${final_pass}" | chpasswd
 chmod u+rw /etc/sudoers
 echo "$final_user_name ALL=(ALL:ALL) ALL" | tee -a /etc/sudoers > /dev/null 2>&1
 chmod u-w /etc/sudoers
 rm useradd.sh
 EOF
 fi
+
 proot-distro login $selected_distro -- /bin/sh -c 'bash useradd.sh'
 proot-distro login $selected_distro -- /bin/sh -c 'sudo -k'
 }

diff --git a/setup-termux-desktop b/setup-termux-desktop
@@ -2444,6 +2444,7 @@ function check_for_update_and_update_installer() {
 	if [[ -e "$PREFIX/bin/setup-termux-desktop" ]]; then
 	echo "${R}[${W}-${R}]${G} Checking for update..."${W}
 	echo
+	check_and_create_directory "$termux_desktop_path"
 	local current_script_hash=$(curl -sL https://raw.githubusercontent.com/sabamdarif/termux-desktop/main/setup-termux-desktop | sha256sum | cut -d ' ' -f 1)
 	local local_script_hash=$(basename $(sha256sum $PREFIX/bin/setup-termux-desktop | cut -d ' ' -f 1))
 	    if [[ "$local_script_hash" != "$current_script_hash" ]]; then