hannes/dotfiles
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bootstrap: Do not require sudo when running as root

Browse Source
This commit is contained in:
Hannes Körber
2020-12-08 23:09:09 +01:00
parent 1f0ea0e7be
commit 1a6239e928
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bootstrap.sh
View File

@@ -16,7 +16,11 @@ if [[ "$(readlink "${_SCRIPT_DIR}")" != "${DOTDIR}" ]] ; then
exit 1 exit 1
fi fi
printf "Moving directory to $DOTDIR ...\n" printf "Moving directory to $DOTDIR ...\n"
sudo mv --no-target-directory "${_SCRIPT_DIR}" "${DOTDIR}" sudo=""
if (( $(id -u ) != 0 )) ; then
sudo=sudo
fi
$sudo mv --no-target-directory "${_SCRIPT_DIR}" "${DOTDIR}"
printf "Done\n" printf "Done\n"
else else
printf "Already working in ${DOTDIR}, nothing to do\n" printf "Already working in ${DOTDIR}, nothing to do\n"

14
install.sh
View File

@@ -18,14 +18,22 @@ source /etc/os-release
_SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" _SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
sudowrap() {
if (( $(id -u ) != 0 )) ; then
sudo "${@}"
else
"${@}"
fi
}
_install() { _install() {
_package="$1" ; shift _package="$1" ; shift
if [[ $NAME == "Fedora" ]] ; then if [[ $NAME == "Fedora" ]] ; then
sudo dnf install --assumeyes "${_package}" sudowrap dnf install --assumeyes "${_package}"
elif [[ $NAME == "Ubuntu" ]] ; then elif [[ $NAME == "Ubuntu" ]] ; then
sudo apt-get install --assume-yes "${_package}" sudowrap apt-get install --assume-yes "${_package}"
elif [[ $NAME == "Arch Linux" ]] ; then elif [[ $NAME == "Arch Linux" ]] ; then
sudo pacman -S --noconfirm "${_package}" sudowrap pacman -S --noconfirm "${_package}"
else else
2>&1 printf "Unsupported distro $NAME, exiting" 2>&1 printf "Unsupported distro $NAME, exiting"
exit 1 exit 1