fix install again, again
This commit is contained in:
parent
bc4d708ea2
commit
d9daae4cc4
|
@ -2,8 +2,11 @@
|
||||||
# Install scripts from this repo using our neighbour paf.sh.
|
# Install scripts from this repo using our neighbour paf.sh.
|
||||||
# Requires fdfind and fzf to work.
|
# Requires fdfind and fzf to work.
|
||||||
|
|
||||||
script_dir="$( cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd )"
|
our_dir="$( cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd )"
|
||||||
paf="$script_dir/paf.sh"
|
paf="$our_dir/paf.sh"
|
||||||
|
scripts_dir="$1"
|
||||||
|
[[ -z "$scripts_dir" ]] && scripts_dir="$our_dir"
|
||||||
|
|
||||||
fdfind -t x | fzf --multi --layout=reverse --header="Pick scripts to install" \
|
fdfind -t x . "$scripts_dir" \
|
||||||
|
| fzf --multi --layout=reverse --header="Pick scripts to install" \
|
||||||
| while read -r script; do "$paf" "$script"; done
|
| while read -r script; do "$paf" "$script"; done
|
||||||
|
|
14
paf.sh
14
paf.sh
|
@ -5,12 +5,24 @@
|
||||||
# exists at the link path, the script fails (last command is ln itself). This is
|
# exists at the link path, the script fails (last command is ln itself). This is
|
||||||
# intentional.
|
# intentional.
|
||||||
|
|
||||||
|
usage() {
|
||||||
|
echo "Usage: $0 script [link_name]"
|
||||||
|
echo " script script or executable to install"
|
||||||
|
echo " link_name name to use for the symbolic link"
|
||||||
|
}
|
||||||
|
|
||||||
|
[ $# -lt 1 ] || [ $# -gt 2 ] && usage && exit 1
|
||||||
|
|
||||||
script_dir="$HOME/.local/bin"
|
script_dir="$HOME/.local/bin"
|
||||||
script="$(realpath "$1")"
|
script="$(realpath "$1")"
|
||||||
if [ -n "$2" ]; then
|
[ ! -f "$script" ] && echo "$script does not exist." && exit 1
|
||||||
|
[ ! -x "$script" ] && echo "$script is not executable." && exit 1
|
||||||
|
|
||||||
|
if [[ -n "$2" ]]; then
|
||||||
script_name="$2"
|
script_name="$2"
|
||||||
else
|
else
|
||||||
script_name="$(basename "$script")"
|
script_name="$(basename "$script")"
|
||||||
script_name="${script_name%.*}" # remove extension
|
script_name="${script_name%.*}" # remove extension
|
||||||
fi
|
fi
|
||||||
|
|
||||||
ln -s "$script" "$script_dir/$script_name"
|
ln -s "$script" "$script_dir/$script_name"
|
||||||
|
|
Loading…
Reference in a new issue