fbt/ufw-tools
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use XDG!

Browse Source
This commit is contained in:
Jack L. Frost 2015-10-13 13:52:26 +03:00
parent e3d642a730
commit 1809fde7c9
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sup
View File

@ -6,8 +6,13 @@
_self="${0##*/}" _self="${0##*/}"
# Defaults for XDG
if ! [[ "$XDG_RUNTIME_DIR" ]]; then
XDG_RUNTIME_DIR="/run/user/$UID"
fi
cfg_url_regex='^[A-Za-z]([A-Za-z0-9+.-]+)?://.+' cfg_url_regex='^[A-Za-z]([A-Za-z0-9+.-]+)?://.+'
cfg_tmp_dir="/tmp/$USER/sup"; TEMPDIR="$cfg_tmp_dir" cfg_tmp_dir="$XDG_RUNTIME_DIR/sup"; TEMPDIR="$cfg_tmp_dir"
cfg_service_url='https://zfh.so' cfg_service_url='https://zfh.so'
cfg_screenshot_ext='png' cfg_screenshot_ext='png'
@ -19,6 +24,10 @@ _cat() {
done done
} }
is_url() {
[[ "$1" =~ $cfg_url_regex ]]
}
sup.msg() { printf '%s\n' "[sup] $1"; } sup.msg() { printf '%s\n' "[sup] $1"; }
sup.err() { sup.msg "(error) $1" >&2; } sup.err() { sup.msg "(error) $1" >&2; }
@ -65,7 +74,7 @@ sup.upload() {
target="$1" target="$1"
if sup.if_url "$target"; then if is_url "$target"; then
file=$(sup.mktemp "$cfg_tmp_dir") file=$(sup.mktemp "$cfg_tmp_dir")
curl -skL "$target" > "$file" || { curl -skL "$target" > "$file" || {
@ -150,8 +159,6 @@ sup.scrot() {
printf '%s\n' "$tmp_file" printf '%s\n' "$tmp_file"
} }
sup.if_url() { printf '%s\n' "$1" | grep -oE "$cfg_url_regex" &>/dev/null; }
sup.mktemp() { sup.mktemp() {
declare tmp_file_name tmp_file_name_extra="$2" tmp_dir="$1" declare tmp_file_name tmp_file_name_extra="$2" tmp_dir="$1"

7
supd
View File

@ -1,8 +1,13 @@
#!/usr/bin/env bash #!/usr/bin/env bash
shopt -s nullglob shopt -s nullglob
# Defaults for XDG
if ! [[ "$XDG_RUNTIME_DIR" ]]; then
XDG_RUNTIME_DIR="/run/user/$UID"
fi
# Defaults # Defaults
cfg_workdir="/tmp/$USER/supd" cfg_workdir="$XDG_RUNTIME_DIR/supd"
cfg_scan_delay='30' cfg_scan_delay='30'
msg() { printf '%s\n' "$*"; } msg() { printf '%s\n' "$*"; }