EndeavourOS/eos-bash-shared
1
0
Fork 0
mirror of https://github.com/endeavouros-team/eos-bash-shared.git synced 2026-06-13 01:34:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

[eos-bash-shared] eos-sendlog: replaced yad dialog to text msg for ssh connection

Browse Source
This commit is contained in:
manuel
2024-03-25 17:50:31 +02:00
parent 9facf42572
commit b4d4de8ec3
2 changed files with 71 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
eos-sendlog
+13 -10
View File
@@ -8,18 +8,19 @@ Verbose() { [ $verbose = yes ] && echo -e "$@" >&2 ; }
Options() {
local opts
local sopts="e:hv"
local lopts="0x0,dpaste,termbin" # pastebin options
lopts+=",expire:,help,verbose" # general options
local lopts="0x0,dpaste,termbin" # pastebin options
lopts+=",expire:,help,verbose,no-yad" # general options
opts="$(/bin/getopt -o="$sopts" --longoptions "$lopts" --name "$progname" -- "$@")" || Usage 1
eval set -- "$opts"
while true ; do
case "$1" in
--0x0 | --dpaste | --termbin) pastebin_service="$1" ;;
-e | --expire) expire="$2"; shift ;;
-h | --help) Usage 0 ;;
-v | --verbose) verbose=yes ;;
--0x0 | --dpaste | --termbin) helper_options+=("$1") ;;
-e | --expire) helper_options+=(--expire="$2"); shift ;;
--no-yad) helper_options+=($1) ;;
--) shift; break ;;
*) break ;;
esac
@@ -43,6 +44,7 @@ ${progname}-options:
--verbose, -v Be more verbose.
--expire, -e The URL will expire in X days. Default: $expire_def.
Currently supported only for 0x0.st.
--no-yad Prevent using yad messages (useful if display cannot be opened).
Without ${progname}-options the services are tried in order:
1. 0x0
@@ -59,22 +61,23 @@ EOF
Main() {
local progname=${0##*/}
local pastebin_service=""
local commands=""
local verbose=no
local -r expire_def=7 # days
local expire=$expire_def # days
local helper_options=(--expire=$expire_def)
Options "$@"
expire="--expire=$expire"
if [ "$commands" ] ; then
Verbose "==> input from commands..."
LANG=C bash -c "$commands" | eos-sendlog-helper $pastebin_service $expire
eos-sendlog-helper "${helper_options[@]}" "$commands"
else
Verbose "==> input from stdin..."
eos-sendlog-helper $pastebin_service $expire
local -r file=$(mktemp)
chmod go-rwx $file
cat > $file
eos-sendlog-helper "${helper_options[@]}" --infile=$file
rm -f $file
fi
}
eos-sendlog-helper
+58 -25
View File
@@ -8,13 +8,14 @@ Usage() {
cat <<EOF >&2
$progname sends the input (stdin) to a pastebin service.
Usage: $progname [options]
Usage: $progname [options] command-string
Options:
--0x0 Uses 0x0.st
--dpaste Uses dpaste.com
--termbin Uses termbin.com
--help, -h This help
--expire=* Specifies the URL expiration time in days.
--no-yad Prevent using yad messages.
Without options the services are tried in order until one succeeds or all fail.
Trial order: 0x0 dpaste termbin.
@@ -53,23 +54,44 @@ GeneralWarning() {
[termbin]="termbin.com"
)
local txt=""
local stop=no
txt+="You are about to send <i>your data</i> to a pastebin service on the internet.\n"
txt+="Anyone will be able to see the data.\n"
txt+="Please make sure you are not sending any unwanted information.\n\n"
txt+="If you want to manage the information you've sent already, please contact <b>${urls[$srv]}</b>.\n"
local cmd=(
eos_yad --form --title="Warning" --text="$txt"
--button="yad-quit!!Do not send":1 --button="yad-execute!!Continue sending":3
)
case "$yad" in
yes)
local cmd=(
eos_yad --form --title="Warning" --text="$txt"
--button="yad-quit!!Do not send":1 --button="yad-execute!!Continue sending":3
)
"${cmd[@]}"
"${cmd[@]}"
case "$?" in
3) ;; # echo "Sending." >&2 ;;
*) echo "Nothing sent." >&2; exit 0 ;;
case "$?" in
3) ;;
*) stop=yes ;;
esac
;;
no)
ReopenStdin
echo -e "$txt" | sed -e 's|<.>||' -e 's|</.>||' >&2
read -p "Continue sending (Y/n)? " >&2
case "$REPLY" in
[Nn]*) stop=yes ;;
esac
;;
esac
[ $stop = yes ] && { echo2 "Nothing sent."; exit 0; }
}
ReopenStdin() {
if [ $stdin_needs_opening = yes ] ; then
stdin_needs_opening=no
exec < /dev/tty
fi
}
Main() {
@@ -78,39 +100,50 @@ Main() {
local -r timeout=10 # max seconds to wait when sending to pastebin
local -r curl="/bin/curl --fail -Lsm $timeout"
local count=0
local services=()
local testing=no
local services=(
0x0
dpaste
termbin
)
local expire=7 # this initial value here will always be overwritten by eos-sendlog
local yad=yes
local infile=""
local commands=""
local stdin_needs_opening=no
while true ; do
case "$XDG_SESSION_TYPE" in
x11) [ "$DISPLAY" ] || yad=no ;;
wayland-*) [ "$WAYLAND_DISPLAY" ] || yad=no ;;
esac
while [ "$1" ] ; do
case "$1" in
--testing) testing=yes ;;
--0x0 | --dpaste | --termbin) services+=("${1:2}"); break ;;
--0x0 | --dpaste | --termbin) services=("${1:2}") ;;
--help | -h) Usage 0 ;;
--expire=*) expire="${1#*=}" ;;
--no-yad) yad=no ;;
--infile=*) infile="${1#*=}"; break ;;
-*) echo2 "Unsupported option '$1'"; exit 1 ;;
*) services=(
0x0
dpaste
termbin
)
break
;;
*) commands="$*"; break ;;
esac
shift
done
if [ "$testing" = "no" ] ; then
local -r input=$(cat)
if [ "$infile" ] ; then
local -r input="$(cat $infile)" # input from a file
stdin_needs_opening=yes
elif [ "$commands" ] ; then
local -r input="$(LANG=C bash -c "$commands")" # input from commands
else
local -r input="this is a test"
local -r input="$(cat)" # input from stdin
stdin_needs_opening=yes
fi
[ "$input" ] || DIE "No input!"
source /usr/share/endeavouros/scripts/eos-script-lib-yad || exit 1
for srv in "${services[@]}" ; do
[ "$testing" = "no" ] && GeneralWarning
GeneralWarning
if Tee "$srv" ; then
cat $log
return 0