Sam Hardeman
160a7763b7
- Change shebangs to use 'env' in prep for NixOS (and others) - `agenda` now has a symlink to the underlying tree structure named ".tree" - `binbox` has more checking, being prepped for automatic export of symlinks. - `cdz` now symlinks to the archive directory using "<archive name>.tmp". This is less confusing than a randomized extraction folder, and adds the benefit of being in the FS-tree of the original archive. - daisy.source changes: > Added basic debug mode. > `ched` can now set global (all of the shell) editor or local (lackadaisical utils only) editor. > The encoding/decoding functions have been expanded and improved. Extra checking, permissions are stored as well, `daisy_dec` can handle stdin. - Added new functions to manage lackadaisical config: daisy_backup (runs `bak` on config files), daisy_clear (removes config files), and daisy_restore (restores config files archived using bak). - All functions/tools prefixed with 'daisy_' are now also available prefixed with 'ld_' instead - Added a new utility, `clip`. This utility keeps a local variable that can be set if given args and get if no args are supplied. Basically a simple clipboard local to the ptty. Supports stdin.
95 lines
2.1 KiB
Bash
Executable file
95 lines
2.1 KiB
Bash
Executable file
#!/usr/bin/env bash
|
|
|
|
mounts=()
|
|
ssh_args=()
|
|
remote_port=$((10000 + RANDOM % 10000))
|
|
local_user=$(whoami)
|
|
|
|
usage()
|
|
{
|
|
echo "sshp (\"SSH PLUS\") from lackadaisical."
|
|
echo "Accepts all standard SSH options (see man ssh)."
|
|
echo "Additionally, supports SSHFS mounts using a Docker-style syntax (-m)."
|
|
echo "Usage: sshp -m <local>:<remote> [user@]host [ssh_options]"
|
|
echo "Example: sshp -m /home/juli:/home/juli juli@juli.pyon"
|
|
exit 1
|
|
}
|
|
|
|
while [[ $# -gt 0 ]]; do
|
|
case "$1" in
|
|
-m)
|
|
if [[ -z "$2" ]]
|
|
then
|
|
echo "Error: -m requires argument"
|
|
exit 1
|
|
fi
|
|
mounts+=("$2")
|
|
shift 2
|
|
;;
|
|
*)
|
|
ssh_args+=("$1")
|
|
shift
|
|
;;
|
|
esac
|
|
done
|
|
|
|
if [[ ${#ssh_args[@]} -eq 0 ]]
|
|
then
|
|
usage
|
|
fi
|
|
|
|
mount_logic=""
|
|
unmount_logic=""
|
|
|
|
for map in "${mounts[@]}"; do
|
|
local_path="${map%%:*}"
|
|
remote_path="${map##*:}"
|
|
|
|
if [[ "$local_path" != /* ]]
|
|
then
|
|
local_path="$PWD/$local_path"
|
|
fi
|
|
|
|
mount_logic+="
|
|
echo '>> Preparing mount: ${remote_path}';
|
|
if ! mkdir -p \"${remote_path}\" 2>/dev/null
|
|
then
|
|
sudo mkdir -p \"${remote_path}\"
|
|
fi
|
|
|
|
if ! sshfs -p ${remote_port} -o StrictHostKeyChecking=no,idmap=user ${local_user}@localhost:\"${local_path}\" \"${remote_path}\" 2>/dev/null
|
|
then
|
|
echo ' (User mount failed, attempting escalation...)';
|
|
if ! sudo sshfs -p ${remote_port} -o StrictHostKeyChecking=no,idmap=user,allow_other ${local_user}@localhost:\"${local_path}\" \"${remote_path}\"
|
|
then
|
|
echo ' ! Mount failed completely. Check permissions or keys.';
|
|
fi
|
|
else
|
|
echo ' > Mounted successfully.';
|
|
fi
|
|
"
|
|
|
|
unmount_logic+="
|
|
fusermount -u -z \"${remote_path}\" 2>/dev/null || sudo fusermount -u -z \"${remote_path}\" 2>/dev/null;
|
|
"
|
|
done
|
|
|
|
remote_script="
|
|
if ! command -v sshfs >/dev/null 2>&1
|
|
then
|
|
echo 'WARNING: \"sshfs\" not found on remote host.'
|
|
echo '>> Skipping mounts, proceeding with shell only...';
|
|
echo '----------------------------------------------';
|
|
else
|
|
${mount_logic}
|
|
fi
|
|
|
|
${SHELL:-bash};
|
|
|
|
if command -v sshfs >/dev/null 2>&1
|
|
then
|
|
${unmount_logic}
|
|
fi
|
|
"
|
|
|
|
ssh -t -R ${remote_port}:localhost:22 "${ssh_args[@]}" "$remote_script"
|