Merge with debug branch

This commit is contained in:
framp 2018-08-19 17:59:44 +02:00
commit 15c43f1199
1 changed files with 4 additions and 35 deletions

View File

@ -2,35 +2,6 @@
version="v0.1.1" version="v0.1.1"
# nice function to get user who invoked this script via sudo
# Borrowed from http://stackoverflow.com/questions/4598001/how-do-you-find-the-original-user-through-multiple-sudo-and-su-commands
# adapted to return current user if no sudoers is used
function findUser() {
if [[ -z "$SUDO_USER" || "$SUDO_USER" == "root" ]]; then
echo $USER
return
fi
thisPID=$$
origUser=$(whoami)
thisUser=$origUser
while [ "$thisUser" = "$origUser" ]; do
if [ "$thisPID" = "0" ]; then
thisUser="root"
break
fi
ARR=($(ps h -p$thisPID -ouser,ppid;))
thisUser="${ARR[0]}"
myPPid="${ARR[1]}"
thisPID=$myPPid
done
getent passwd "$thisUser" | cut -d: -f1
}
function info() { function info() {
echo "$1..." echo "$1..."
} }
@ -46,11 +17,8 @@ function cleanup() {
losetup -d "$loopback" losetup -d "$loopback"
fi fi
if [ "$debug" = true ]; then if [ "$debug" = true ]; then
# give logfile back to user local old_owner=$(stat -c %u:%g "$src")
local user=$(findUser) chown $old_owner "$LOGFILE"
if [[ $user != "root" ]]; then
chown --reference=/home/$user "$LOGFILE"
fi
fi fi
} }
@ -97,6 +65,7 @@ fi
echo "${0##*/} $version" echo "${0##*/} $version"
#Args #Args
src="$1"
img="$1" img="$1"
#Usage checks #Usage checks
@ -256,8 +225,8 @@ if ! e2fsck -pf "$loopback"; then
if ! e2fsck -yv "$loopback"; then if ! e2fsck -yv "$loopback"; then
rc=$? rc=$?
error $LINENO "e2fsck -y failed with rc $rc. Giving up to fix corrupted filesystem." error $LINENO "e2fsck -y failed with rc $rc. Giving up to fix corrupted filesystem."
fi
exit -9 exit -9
fi
fi fi
if ! minsize=$(resize2fs -P "$loopback"); then if ! minsize=$(resize2fs -P "$loopback"); then