Miroirs/Conty
1
0
Fork 0
mirror of https://github.com/Kron4ek/Conty synced 2024-11-16 19:50:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove fmount variable

Browse source
This commit is contained in:
Kron4ek 2021-05-19 13:23:31 +05:00 committed by GitHub
parent 2a6b1ccdf6
commit 076c91ffdb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
conty-start.sh
View file

@ -31,7 +31,7 @@ export working_dir=/tmp/"$(basename "${script}")"_"${USER}"_"${script_md5}"
# 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=18001 scriptsize=17976
# 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
@ -227,8 +227,6 @@ fi
if [ -z "${SUDO_MOUNT}" ] && ! command -v fusermount 1>/dev/null; then if [ -z "${SUDO_MOUNT}" ] && ! command -v fusermount 1>/dev/null; then
echo "Please install fuse2 and run the script again!" echo "Please install fuse2 and run the script again!"
exit 1 exit 1
else
fmount=fusermount
fi fi
if [ -n "${BASE_DIR}" ]; then if [ -n "${BASE_DIR}" ]; then
@ -454,7 +452,7 @@ trap_exit () {
rm -f "${working_dir}"/running_"${script_id}" rm -f "${working_dir}"/running_"${script_id}"
if [ ! "$(ls "${working_dir}"/running_* 2>/dev/null)" ]; then if [ ! "$(ls "${working_dir}"/running_* 2>/dev/null)" ]; then
"${fmount}" -uz "${working_dir}"/mnt 2>/dev/null || \ fusermount -uz "${working_dir}"/mnt 2>/dev/null || \
${use_sudo} umount --lazy "${working_dir}"/mnt 2>/dev/null ${use_sudo} umount --lazy "${working_dir}"/mnt 2>/dev/null
rm -rf "${working_dir}" rm -rf "${working_dir}"