Miroirs/Conty
1
0
Fork 0
mirror of https://github.com/Kron4ek/Conty synced 2024-12-27 09:58:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix the self-update function

Browse source 
Hopefully for sure this time.
This commit is contained in:
Kron4ek 2021-06-01 22:24:10 +05:00 committed by GitHub
parent ed2fc50297
commit b88de42bc4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
conty-start.sh
View file

@ -12,7 +12,7 @@ if [ $EUID = 0 ] && [ -z "$ALLOW_ROOT" ]; then
exit 1 exit 1
fi fi
script_version="1.11" script_version="1.12"
# Full path to the script # Full path to the script
script_literal="${BASH_SOURCE[0]}" script_literal="${BASH_SOURCE[0]}"
@ -39,7 +39,7 @@ mount_point="${working_dir}"/mnt
# a problem with mounting the squashfs image due to an incorrectly calculated offset. # a problem with mounting the squashfs image due to an incorrectly calculated offset.
# The size of this script # The size of this script
scriptsize=18331 scriptsize=18334
# The size of the utils.tar archive # The size of the utils.tar archive
# utils.tar contains bwrap and squashfuse binaries # utils.tar contains bwrap and squashfuse binaries
@ -150,6 +150,7 @@ elif [ "$1" = "-u" ] || [ "$1" = "-U" ]; then
# SANDBOX and DISABLE_NET (if they are enabled) for this to work properly # SANDBOX and DISABLE_NET (if they are enabled) for this to work properly
unset DISABLE_NET unset DISABLE_NET
unset SANDBOX unset SANDBOX
unset HOME_DIR
# Extract the squashfs image # Extract the squashfs image
clear clear
@ -212,15 +213,16 @@ update-ca-trust
locale-gen locale-gen
EOF EOF
bind_items="--bind sqfs/var /var --bind sqfs/etc /etc --bind sqfs/usr /usr \ rm -f sqfs/etc/resolv.conf
--ro-bind-try /etc/resolv.conf /etc/resolv.conf \ cp /etc/resolv.conf sqfs/etc/resolv.conf
--ro-bind-try /etc/nsswitch.conf /etc/nsswitch.conf \ mkdir -p sqfs/run/shm
--ro-bind-try /etc/hosts /etc/hosts"
# Execute the previously generated script # Execute the previously generated script
clear clear
echo "Updating and installing packages" echo "Updating and installing packages"
bash "${script}" ${bind_items} bash container-update.sh bash "${script}" --bind sqfs / --ro-bind /sys /sys --dev-bind /dev /dev \
--proc /proc --bind "${update_temp_dir}" "${update_temp_dir}" \
bash container-update.sh
# Create a squashfs image # Create a squashfs image
clear clear
@ -233,7 +235,7 @@ EOF
cat conty-start.sh utils.tar image > conty_updated.sh cat conty-start.sh utils.tar image > conty_updated.sh
chmod +x conty_updated.sh chmod +x conty_updated.sh
mv "${script}" "${script}".old mv -f "${script}" "${script}".old."${script_md5}"
mv conty_updated.sh "${script}" || \ mv conty_updated.sh "${script}" || \
mv conty_updated.sh "${OLD_PWD}" || \ mv conty_updated.sh "${OLD_PWD}" || \
mv conty_updated.sh "${HOME}" mv conty_updated.sh "${HOME}"