slococo
/
sadedot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update 'other' files handling

This commit is contained in:
Santiago Lo Coco 2022-02-15 19:21:53 -03:00
parent be8e1ff190
commit 07d0a7b36b
1 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
scripts/linkFiles.sh
View File

@ -78,18 +78,29 @@ loopThroughFiles() {
done < <(find -H "$DOTFILES" -maxdepth 1 -mindepth 1 -type d -not -path '*other*' -print0) done < <(find -H "$DOTFILES" -maxdepth 1 -mindepth 1 -type d -not -path '*other*' -print0)
if [ -d "$DOTFILES/other" ]; then if [ -d "$DOTFILES/other" ]; then
files="" msg="\nThere are 'other' files, would you like to install all of them"
while read -r -d '' item; do msg="${msg} or do you prefer to select which ones to install? Also, if"
item=$(echo "$item" | awk '{ sub(/.*dotfiles\/other\//, ""); print }') msg="${msg} you don't want to install them, you can press Cancel."
files="${files}$item\n" buttons=("--yes-label" " Install all " "--extra-button")
buttons+=("--extra-label" " Select which " "--no-label" " Cancel ")
displayDialogBox "${buttons[@]}" --yesno "$msg"
case $? in
0) installAll=true ;;
3) installAll=false ;;
1) return ;;
esac
files=()
while read -r -d '' srcFile; do
file=$(echo "$srcFile" | awk '{ sub(/.*dotfiles\/other\//, ""); print }')
msg="\nWould you like to install:\n\n'/$file'?"
[ "$installAll" = true ] || displayDialogBox --yesno "$msg" || continue
files+=("$srcFile")
done < <(find -H "$DOTFILES/other" -mindepth 1 -type f -print0) done < <(find -H "$DOTFILES/other" -mindepth 1 -type f -print0)
msg="\nThere are 'other' files, would you like to install them?\n\n${files}"
displayDialogBox --yesno "$msg" || return
fi fi
password=$(displayDialogBox --passwordbox "\nEnter your password." VALUES 3>&1 1>&2 2>&3) password=$(displayDialogBox --passwordbox "\nEnter your password." VALUES 3>&1 1>&2 2>&3)
echo "$password" | sudo -S bash -c "" > /dev/null 2>&1 echo "$password" | sudo -S bash -c "" > /dev/null 2>&1
cmd="$(declare -f runDetachedScript); $(declare -f linkFile); runDetachedScript getDialogBox" cmd="$(declare -f runDetachedScript); $(declare -f linkFile); runDetachedScript getDialogBox ${files[@]}"
echo "$password" | sudo -S bash -c "$cmd" echo "$password" | sudo -S bash -c "$cmd"
unset password unset password
} }
@ -102,20 +113,16 @@ runDetachedScript() {
DOTFILES="$SADEDOT/dotfiles" DOTFILES="$SADEDOT/dotfiles"
local IFS= local IFS=
while read -r -d '' srcFile; do shift; for srcFile in "$@"; do
if [[ -d "$srcFile" ]]; then var=$(echo "$srcFile" | awk '{ sub(/.*dotfiles\/other\//, ""); print }')
var=$(echo "$srcFile" | awk '{ sub(/.*dotfiles\/other\//, ""); print }')
varFolder=$(echo "$var" | sed "s/$(basename $var)//")
if [[ ! -d "/$var" ]]; then if [[ ! -d "/$varFolder" ]]; then
mkdir -p "/$var" mkdir -p "/$var"
fi
fi fi
if [[ -f "$srcFile" ]]; then linkFile "$srcFile" "/$var"
var=$(echo "$srcFile" | awk '{ sub(/.*dotfiles\/other\//, ""); print }') done
linkFile "$srcFile" "/$var"
fi
done < <(find -H "$DOTFILES/other" -mindepth 1 -print0)
} }
runScript() { runScript() {