Merge branch '10-no-permission-for-any-files-in-home-dir' into 'master'

Resolve "No permission for any files in home dir"

Closes #10

See merge request marty-oehme/dotfiles!4
This commit is contained in:
Marty Oehme 2019-03-12 13:44:44 +00:00
commit 456859adfa

View file

@ -157,16 +157,16 @@ putgitrepo() { # Downlods a gitrepo $1 and places the files in $2 only overwriti
sudo -u "$name" git clone --bare "$1" "$dir/gitrepo" >/dev/null 2>&1 &&
sudo -u "$name" cp -rfT "$dir/gitrepo" $dfdir/.dotfiles
dotfiles $dfdir checkout
sudo -u "$name" dotfiles $dfdir checkout
if [ $? = 0 ]; then
echo "Checked out dotfiles.";
else
echo "Backing up existing dotfiles.";
mkdir -p $2/.dotfiles-backup
dotfiles $dfdir checkout 2>&1 | egrep "\s+\." | awk {'print $1'} | xargs -I{} mv {} $2/.dotfiles-backup/{}
sudo -u "$name" dotfiles $dfdir checkout 2>&1 | egrep "\s+\." | awk {'print $1'} | xargs -I{} mv {} $2/.dotfiles-backup/{}
fi;
dotfiles $dfdir checkout
dotfiles $dfdir config status.showUntrackedFiles no
sudo -u "$name" dotfiles $dfdir checkout
sudo -u "$name" dotfiles $dfdir config status.showUntrackedFiles no
}
serviceinit() { for service in "$@"; do