QubesOS/qubes-linux-template-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make sure the logged in user name is used for su <user> -c

Browse Source
This commit is contained in:
Jason Mehring 2014-10-20 19:45:23 -04:00
parent 5d3d538c92
commit aef3f12097
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
scripts_debian/custom_wheezy_whonix/02_install_groups_packages_installed.sh
View File

@ -173,7 +173,7 @@ if ! [ -f "$INSTALLDIR/tmp/.prepared_whonix" ]; then
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
pushd "$WHONIX_DIR" pushd "$WHONIX_DIR"
{ {
su user -c "git submodule update --init --recursive" su $(logname) -c "git submodule update --init --recursive"
} }
popd popd
@ -185,10 +185,10 @@ if ! [ -f "$INSTALLDIR/tmp/.prepared_whonix" ]; then
checkout_branch() { checkout_branch() {
branch=$(git symbolic-ref --short -q HEAD) branch=$(git symbolic-ref --short -q HEAD)
if ! [ "$branch" == "$1" ]; then if ! [ "$branch" == "$1" ]; then
su user -c git checkout "$1" >/dev/null 2>&1 || \ su $(logname) -c git checkout "$1" >/dev/null 2>&1 || \
{ {
su user -c git branch "$1" su $(logname) -c git branch "$1"
su user -c git checkout "$1" su $(logname) -c git checkout "$1"
} }
fi fi
} }
@ -218,10 +218,10 @@ if ! [ -f "$INSTALLDIR/tmp/.prepared_whonix" ]; then
{ {
cd "$WHONIX_DIR/packages/anon-meta-packages" cd "$WHONIX_DIR/packages/anon-meta-packages"
: :
#sudo -E -u user make deb-pkg || : #sudo -E -u $(logname) make deb-pkg || :
#su user -c "dpkg-source --commit" || : #su $(logname) -c "dpkg-source --commit" || :
#git add . #git add .
#su user -c "git commit -am 'removed grub-pc depend'" #su $(logname) -c "git commit -am 'removed grub-pc depend'"
} || : } || :
} }
popd popd
@ -235,10 +235,10 @@ if ! [ -f "$INSTALLDIR/tmp/.prepared_whonix" ]; then
search_replace "$search1" "$replace" 85_update_grub && \ search_replace "$search1" "$replace" 85_update_grub && \
{ {
cd "$WHONIX_DIR/packages/anon-shared-build-fix-grub" cd "$WHONIX_DIR/packages/anon-shared-build-fix-grub"
sudo -E -u user make deb-pkg || : sudo -E -u $(logname) make deb-pkg || :
su user -c "EDITOR=/bin/true dpkg-source -q --commit . no_grub" su $(logname) -c "EDITOR=/bin/true dpkg-source -q --commit . no_grub"
#git add . #git add .
#su user -c "git commit -am 'removed grub-pc depend'" #su $(logname) -c "git commit -am 'removed grub-pc depend'"
} || : } || :
} }
popd popd