From 1809fde7c929597b777c9b6c642f7c6e45d92329 Mon Sep 17 00:00:00 2001
From: fbt <fbt@fleshless.org>
Date: Tue, 13 Oct 2015 13:52:26 +0300
Subject: [PATCH] use XDG!

---
 sup  | 15 +++++++++++----
 supd |  7 ++++++-
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/sup b/sup
index 212925d..87fe6f1 100755
--- a/sup
+++ b/sup
@@ -6,8 +6,13 @@
 
 _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_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_screenshot_ext='png'
 
@@ -19,6 +24,10 @@ _cat() {
 	done
 }
 
+is_url() {
+	[[ "$1" =~ $cfg_url_regex ]]
+}
+
 sup.msg() { printf '%s\n' "[sup] $1"; }
 sup.err() { sup.msg "(error) $1" >&2; }
 
@@ -65,7 +74,7 @@ sup.upload() {
 
 		target="$1"
 
-		if sup.if_url "$target"; then
+		if is_url "$target"; then
 			file=$(sup.mktemp "$cfg_tmp_dir")
 
 			curl -skL "$target" > "$file" || {
@@ -150,8 +159,6 @@ sup.scrot() {
 	printf '%s\n' "$tmp_file"
 }
 
-sup.if_url() { printf '%s\n' "$1" | grep -oE "$cfg_url_regex" &>/dev/null; }
-
 sup.mktemp() {
 	declare tmp_file_name tmp_file_name_extra="$2" tmp_dir="$1" 
 
diff --git a/supd b/supd
index 450fa32..7d2e07d 100755
--- a/supd
+++ b/supd
@@ -1,8 +1,13 @@
 #!/usr/bin/env bash
 shopt -s nullglob
 
+# Defaults for XDG
+if ! [[ "$XDG_RUNTIME_DIR" ]]; then
+	XDG_RUNTIME_DIR="/run/user/$UID"
+fi
+
 # Defaults
-cfg_workdir="/tmp/$USER/supd"
+cfg_workdir="$XDG_RUNTIME_DIR/supd"
 cfg_scan_delay='30'
 
 msg() { printf '%s\n' "$*"; }