Merge pull request #2220 from cdr/remote-install-5bc0

install.sh: Allow customizing remote shell for remote installation
This commit is contained in:
Anmol Sethi 2020-10-23 12:07:35 -04:00 committed by GitHub
commit 6cc1ee1b00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 7 deletions

View File

@ -24,7 +24,7 @@ ${not_curl_usage-}
Usage: Usage:
$arg0 [--dry-run] [--version X.X.X] [--method detect] \ $arg0 [--dry-run] [--version X.X.X] [--method detect] \
[--prefix ~/.local] [user@host] [--prefix ~/.local] [--rsh ssh] [user@host]
--dry-run --dry-run
Echo the commands for the install process without running them. Echo the commands for the install process without running them.
@ -45,6 +45,9 @@ Usage:
and the binary symlinked into ~/.local/bin/code-server and the binary symlinked into ~/.local/bin/code-server
To install system wide pass ---prefix=/usr/local To install system wide pass ---prefix=/usr/local
--rsh <bin>
Specifies the remote shell for remote installation. Defaults to ssh.
- For Debian, Ubuntu and Raspbian it will install the latest deb package. - For Debian, Ubuntu and Raspbian it will install the latest deb package.
- For Fedora, CentOS, RHEL and openSUSE it will install the latest rpm package. - For Fedora, CentOS, RHEL and openSUSE it will install the latest rpm package.
- For Arch Linux it will install the AUR package. - For Arch Linux it will install the AUR package.
@ -109,7 +112,8 @@ main() {
VERSION \ VERSION \
OPTIONAL \ OPTIONAL \
ALL_FLAGS \ ALL_FLAGS \
SSH_ARGS RSH_ARGS \
RSH
ALL_FLAGS="" ALL_FLAGS=""
while [ "$#" -gt 0 ]; do while [ "$#" -gt 0 ]; do
@ -144,6 +148,13 @@ main() {
--version=*) --version=*)
VERSION="$(parse_arg "$@")" VERSION="$(parse_arg "$@")"
;; ;;
--rsh)
RSH="$(parse_arg "$@")"
shift
;;
--rsh=*)
RSH="$(parse_arg "$@")"
;;
-h | --h | -help | --help) -h | --h | -help | --help)
usage usage
exit 0 exit 0
@ -152,7 +163,7 @@ main() {
shift shift
# We remove the -- added above. # We remove the -- added above.
ALL_FLAGS="${ALL_FLAGS% --}" ALL_FLAGS="${ALL_FLAGS% --}"
SSH_ARGS="$*" RSH_ARGS="$*"
break break
;; ;;
-*) -*)
@ -161,7 +172,7 @@ main() {
exit 1 exit 1
;; ;;
*) *)
SSH_ARGS="$*" RSH_ARGS="$*"
break break
;; ;;
esac esac
@ -169,9 +180,10 @@ main() {
shift shift
done done
if [ "${SSH_ARGS-}" ]; then if [ "${RSH_ARGS-}" ]; then
echoh "Installing remotely with ssh $SSH_ARGS" RSH="${RSH-ssh}"
curl -fsSL https://code-server.dev/install.sh | prefix "$SSH_ARGS" ssh "$SSH_ARGS" sh -s -- "$ALL_FLAGS" echoh "Installing remotely with $RSH $RSH_ARGS"
curl -fsSL https://code-server.dev/install.sh | prefix "$RSH_ARGS" "$RSH" "$RSH_ARGS" sh -s -- "$ALL_FLAGS"
return return
fi fi