Browse Source

Manager: Major restructure of arguments

Optional arguments with spaces aren't supported by GNU getopt. So
instead lets restructure the arguments to make sense without them.
The manager now supports stdin.

This patch also separates file pulling and pushing into separate
functions.
master
Riyyi 3 years ago
parent
commit
2e06b13a69
  1. 211
      dotfiles.sh

211
dotfiles.sh

@ -20,16 +20,18 @@ aurHelper="trizen"
# -------------------------------------- # --------------------------------------
b="$(tput bold)"
red="$(tput setf 4)"
n="$(tput sgr0)"
if [ "$(dirname "$0")" != "." ]; then if [ "$(dirname "$0")" != "." ]; then
echo "Please run this script from the directory it resides." >&2 echo "${b}${red}Error: Please run this script from the directory it resides.${n}" >&2
exit 1 exit 1
fi fi
help() help()
{ {
b=$(tput bold)
u=$(tput smul) u=$(tput smul)
n=$(tput sgr0)
cat << EOF cat << EOF
${b}NAME${n} ${b}NAME${n}
@ -75,24 +77,30 @@ EOF
# Files # Files
# -------------------------------------- # --------------------------------------
setFiles() getFileList()
{ {
files="$(find . -type f -o -type l \ fileList="$(find . -type f -o -type l \
| awk -v e="^./($excludeFiles)" '$0 !~ e { print $0 }')" | awk -v e="^./($excludeFiles)" '$0 !~ e { print $0 }')"
} }
listFiles() getFilteredFileLists()
{ {
# If unset [ -z "$fileList" ] && getFileList
[ -z "${files+x}" ] && setFiles
match="^./($systemDir)/"
# Filter system directories and remove leading ./ from filepaths
homeFileList="$(echo "$fileList" \
| awk -v m="$match" '$0 !~ m { print substr($0, 3) }')"
# Remove leading ./ from filepaths # Filter non-system directories and remove leading ./ from filepaths
echo "$files" | sed 's/^\.\///' systemFileList="$(echo "$fileList" \
| awk -v m="$match" '$0 ~ m { print substr($0, 3) }')"
} }
add() fileAdd()
{ {
[ -z "$1" ] && return 1 [ -z "$1" ] && exit 1
file="$(readlink -f "$(dirname "$1")")/$(basename "$1")" file="$(readlink -f "$(dirname "$1")")/$(basename "$1")"
fileCutHome="$(echo "$file" \ fileCutHome="$(echo "$file" \
@ -109,52 +117,55 @@ add()
fi fi
} }
pullPush() filePull()
{ {
# If unset or empty string if [ -z "$homeFileList" ] || [ -z "$systemFileList" ]; then
[ -z "$1" ] && return 1 getFilteredFileLists
fi
# If unset
[ -z "${files+x}" ] && setFiles
match="^./($systemDir)/"
# Filter system directories and remove leading ./ from filepaths
homeFiles="$(echo "$files" \
| awk -v m="$match" '$0 !~ m { print substr($0, 3) }')"
for f in $homeFiles; do for file in $homeFileList; do
if [ "$1" = "pull" ]; then # /home/<user>/<file> -> dotfiles/<file>
# cp /home/<user>/<file> /[<some dir>/]dotfiles/<file> cp -a "$HOME/$file" "$(pwd)/$file"
cp -a "$HOME/$f" "$(pwd)/$f"
elif [ "$1" = "push" ]; then
mkdir -p "$(dirname "$HOME/$f")"
cp -a "$(pwd)/$f" "$HOME/$f"
fi
done done
# Filter non-system directories and remove leading ./ from filepaths for file in $systemFileList; do
systemFiles="$(echo "$files" \ # /<file> -> dotfiles/<file>
| awk -v m="$match" '$0 ~ m { print substr($0, 3) }')" sudo cp -a "/$file" "$(pwd)/$file"
for f in $systemFiles; do
if [ "$1" = "pull" ]; then
# cp /<file> /[<some dir>/]dotfiles/<file>
sudo cp -a "/$f" "$(pwd)/$f"
elif [ "$1" = "push" ]; then
sudo cp -a "$(pwd)/$f" "/$f"
fi
done done
} }
pull() filePush()
{ {
pullPush "pull" if [ -z "$homeFileList" ] || [ -z "$systemFileList" ]; then
getFilteredFileLists
fi
for file in $homeFileList; do
# dotfiles/<file> -> /home/<user>/<file>
mkdir -p "$(dirname "$HOME/$file")"
cp -a "$(pwd)/$file" "$HOME/$file"
done
for file in $systemFileList; do
# dotfiles/<file> -> /<file>
sudo mkdir -p "$(dirname "/$file")"
sudo cp -a "$(pwd)/$file" "/$file"
done
} }
push() files()
{ {
pullPush "push" if [ "$1" = "list" ] || [ "$1" = "" ]; then
[ -z "$fileList" ] && getFileList
# Remove leading ./ from filepaths
echo "$fileList" | sed 's/^\.\///' | grep "$2"
elif [ "$1" = "add" ]; then
fileAdd "$2"
elif [ "$1" = "pull" ]; then
filePull "$2"
elif [ "$1" = "push" ]; then
filePush "$2"
fi
} }
# Packages # Packages
@ -206,7 +217,7 @@ osDependencies()
done done
} }
packageList() getPackageList()
{ {
if [ "$os" = "arch" ]; then if [ "$os" = "arch" ]; then
filterList="$( (pacman -Qqg base base-devel; pactree -u base | tail -n +2) | sort)" filterList="$( (pacman -Qqg base base-devel; pactree -u base | tail -n +2) | sort)"
@ -227,16 +238,15 @@ packageInstall()
# Grab everything off enabled official repositories that is in the list # Grab everything off enabled official repositories that is in the list
repoList="$(pacman -Ssq | grep -xf $packageFile)" repoList="$(pacman -Ssq | grep -xf $packageFile)"
if [ "$1" = "install" ]; then if [ "$1" = "aur-install" ]; then
# Install packages
echo "$repoList" | xargs --open-tty sudo pacman -Sy --needed
fi
if [ "$1" = "install-aur" ]; then
# Determine which packages in the list are from the AUR # Determine which packages in the list are from the AUR
aurList="$(grep -vx "$repoList" < $packageFile)" aurList="$(grep -vx "$repoList" < $packageFile)"
# Install AUR packages # Install AUR packages
echo "$aurList" | xargs --open-tty "$aurHelper" -Sy --needed --noconfirm echo "$aurList" | xargs --open-tty "$aurHelper" -Sy --needed --noconfirm
elif [ "$1" = "install" ]; then
# Install packages
echo "$repoList" | xargs --open-tty sudo pacman -Sy --needed
fi fi
elif [ "$os" = "debian" ]; then elif [ "$os" = "debian" ]; then
# Grab everything off enabled official repositories that is in the list # Grab everything off enabled official repositories that is in the list
@ -253,60 +263,67 @@ packages()
if [ -z "$os" ]; then if [ -z "$os" ]; then
osDetect osDetect
osDependencies osDependencies
packageList
fi fi
if [ "$1" = "list" ] || [ "$1" = "" ]; then if [ "$1" = "list" ] || [ "$1" = "" ]; then
echo "$packageList" [ -z "$packageList" ] && getPackageList
echo "$packageList" | grep "$2"
elif [ "$1" = "store" ]; then elif [ "$1" = "store" ]; then
[ -z "$packageList" ] && getPackageList
echo "$packageList" > "$packageFile" echo "$packageList" > "$packageFile"
elif [ "$1" = "aur-install" ]; then
packageInstall "aur-install"
elif [ "$1" = "install" ]; then elif [ "$1" = "install" ]; then
packageInstall "install" packageInstall "install"
elif [ "$1" = "install-aur" ]; then
packageInstall "install-aur"
fi fi
} }
# Option handling # Option parsing
# -------------------------------------- # --------------------------------------
script="$(basename "$0")" script="$(basename "$0")"
options="$(getopt --options "ha:fp::ls" --longoptions "help,add:,files,packages::,pull,push" -n "$script" -- "$@" 2>&1)" parsed="$(getopt --options "hFPails" \
--longoptions "help,file,package,add,aur-install,install,pull,push,store" \
-n "$script" -- "$@" 2>&1)"
result="$?" result="$?"
# Exit if invalid option is provided # Exit if invalid option is provided
if [ "$result" -ne 0 ]; then if [ "$result" -ne 0 ]; then
echo "$options" | head -n 1 >&2 echo "$parsed" | head -n 1 >&2
echo "Try './$script --help' for more information." >&2 echo "Try './$script --help' for more information." >&2
exit 1 exit 1
fi fi
eval set -- "$options" eval set -- "$parsed"
while true; do while true; do
case "$1" in case "$1" in
-a | --add) -F | --file)
add "$2" [ -n "$mode" ] && echo "${b}${red}Error: only one operation may be used at a time." >&2 && exit 1
shift 2 mode="file"
shift
;; ;;
-f | --files) -P | --package)
listFiles [ -n "$mode" ] && echo "${b}${red}Error: only one operation may be used at a time." >&2 && exit 1
mode="package"
shift shift
;; ;;
-h | --help) -a | --add | --aur-install)
help [ "$mode" = "file" ] && options="${options}add "
exit [ "$mode" = "package" ] && options="${options}aur-install "
shift
;; ;;
-p | --packages) -i | --install)
packages "$2" options="${options}install "
shift 2 shift
;; ;;
-l | --pull) -l | --pull)
pull options="${options}pull "
shift shift
;; ;;
-s | --push) -s | --push | --store)
push [ "$mode" = "file" ] && options="${options}push "
[ "$mode" = "package" ] && options="${options}store "
shift shift
;; ;;
--) --)
@ -321,3 +338,47 @@ done
# @Todo: # @Todo:
# push function to push just one file # push function to push just one file
# Target parsing
# --------------------------------------
targets="$*"
targetsNoHyphen="$(echo "$targets" | sed -E 's/(^-$|\s-|-\s)//g; s/(\s-\s)/ /;')"
# Read targets from stdin
if [ "$targets" != "$targetsNoHyphen" ]; then
[ -t 0 ] && echo "${b}${red}Error: argument '-' specified without input on stdin." >&2 && exit 1
eval set -- "$targetsNoHyphen $(cat /dev/stdin)"
fi
# Execute
# --------------------------------------
if [ "$mode" = "file" ]; then
if [ -z "$options" ]; then
files "list" "$@"
exit
fi
for option in $options; do
if [ -z "$*" ]; then
[ "$option" = "add" ] && echo "${b}${red}Error: No files or directories selected to add.${n}" >&2 && exit 1
files "$option"
continue
fi
for path; do
files "$option" "$path"
done
done
fi
if [ "$mode" = "package" ]; then
if [ -z "$options" ]; then
packages "list" "$@"
exit
fi
for option in $options; do
packages "$option"
done
fi

Loading…
Cancel
Save