merge

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014, Jack L. Frost <fbt@fleshless.org>
+Copyright (c) 2012-2014, Jack L. Frost <fbt@fleshless.org>
 
 
 Permission to use, copy, modify, and/or distribute this software for any purpose with or without

sup

@@ -4,18 +4,20 @@
 # About:
 # A simple upload script for ZFH (http://zerofiles.org)
 
+_self="${0##*/}"
+
 cfg_url_regex='^[A-Za-z]([A-Za-z0-9+.-]+)?://.+'
 cfg_tmp_dir="/tmp/$USER/sup"; TEMPDIR="$cfg_tmp_dir"
 cfg_script_url='https://zfh.so/upload'
 cfg_screenshot_ext='png'
 
-[[ -f $HOME/.suprc ]] && { source $HOME/.suprc; }
+[[ -f $HOME/.suprc ]] && { source "$HOME/.suprc"; }
 
-sup.msg() { echo "[sup] $1"; }
+sup.msg() { printf '%s\n' "[sup] $1"; }
 sup.err() { sup.msg "(error) $1" >&2; }
 
 sup.usage() {
-	echo "Usage: `basename $0` [-RsF] [-D num] [file/url]"
+	printf '%s\n' "Usage: ${_self} [-RsF] [-D num] [file/url]"
 }
 
 sup.env() {
@@ -32,7 +34,7 @@ sup.upload() {
 		-F submit="" \
 		"$cfg_script_url" -sL -A 'zerofiles.org upload script' || { return 1; }
 
-	[[ "$flag_rm" ]] && { rm "$file"; }
+	(( "$flag_rm" )) && { rm "$file"; }
 
 	return 0
 }
@@ -43,19 +45,19 @@ sup.mktemp() {
 		return 1
 	}
 
-	echo "$1"
+	printf '%s\n' "$1"
 }
 
 sup.scrot() {
-	local tmp_file
+	declare tmp_file
 
-	[[ "$scrot_exec" ]] || { scrot_exec=`which scrot`; }
+	[[ "$scrot_exec" ]] || { scrot_exec=$(type -P scrot); }
 	[[ "$scrot_exec" ]] || {
 		sup.err "Please install scrot to use this function"
 		return 1
 	}
 
-	[[ "$flag_scrot_fullscreen" ]] || { scrot_args+=( '-s' ); }
+	(( "$flag_scrot_fullscreen" )) || { scrot_args+=( '-s' ); }
 	[[ "$cfg_scrot_delay" ]] && { scrot_args+=( "-d $cfg_scrot_delay" ); }
 
 	tmp_file="$(sup.mktemp "${cfg_tmp_dir}" ".${cfg_screenshot_ext}")"
@@ -65,18 +67,13 @@ sup.scrot() {
 		return 1
 	}
 
-	echo "$tmp_file"
+	printf '%s\n' "$tmp_file"
 }
 
-sup.exclude() {
-	[[ "$2" ]] && { echo "$1"; return 1; }
-	return 0
-}
-
-sup.if_url() { echo "$1" | grep -oE "$cfg_url_regex" &>/dev/null; }
+sup.if_url() { printf '%s\n' "$1" | grep -oE "$cfg_url_regex" &>/dev/null; }
 
 sup.mktemp() {
-	local tmp_file_name tmp_file_name_extra="$2" tmp_dir="$1" 
+	declare tmp_file_name tmp_file_name_extra="$2" tmp_dir="$1" 
 
 	[[ -d "$tmp_dir" ]] || {
 		sup.err "${tmp_dir} does not exist or is not a directory."
@@ -87,35 +84,46 @@ sup.mktemp() {
 		tmp_file_name="${RANDOM}${RANDOM}${tmp_file_name_extra}"
 	done
 
-	echo "${tmp_dir}/${tmp_file_name}"
+	printf '%s\n' "${tmp_dir}/${tmp_file_name}"
 }
 
-sup.getopt() {
-	local keys
+sup.set_argv() {
+	declare arg opt c
+	declare -g argv
 
-	for i in "$@"; do
-		case "$i" in
-			--*) echo "$i";;
+	while (( $# )); do
+		unset -v arg opt c
 
-			-*)
-				keys=( `echo "${i##*-}" | fold -w1` )
+		case "$1" in
+			(--) argv+=( "$1" ); break;;
 
-				[[ "${#keys[@]}" -gt 1 ]] && {
-					for k in ${keys[@]}; do
-						echo "-${k}"
-					done
-				} || {
-					echo "$i"
+			(--*)
+				IFS='=' read arg opt <<< "$1"
+				argv+=( "$arg" )
+
+				[[ "$opt" ]] && {
+					argv+=( "$opt" )
 				}
 			;;
 
-			*) echo "$i";;
+			(-*)
+				while read -n1 c
+				do
+					case "$c" in
+						-|'') :;;
+						*) argv+=( "-$c" );;
+					esac
+				done <<< "$1"
+			;;
+
+			(*) argv+=( "$1" );;
 		esac
+		shift
 	done
 }
 
 main() {
-	local args file target flag_private flag_rm flag_scrot flag_scrot_fullscreen cfg_scrot_delay
+	declare args file target flag_private flag_rm flag_scrot flag_scrot_fullscreen cfg_scrot_delay
 
 	while [[ "$1" ]]; do
 		case "$1" in
@@ -128,33 +136,44 @@ main() {
 			
 			-h|--help|--usage) sup.usage; return;;
 
-			--) break;;
+			--) shift; break;;
 
-			*) args+=( "$1" );;
+			*) break;;
 		esac
 		shift
 	done
 
 	sup.env
 
-	if [[ "$flag_scrot" ]]; then
-		file="$(sup.scrot)" || { return 1; }
+	if (( flag_scrot )); then
+		file=$(sup.scrot) || { return 1; }
 	else
-		target="${args[0]}"; [[ "$target" ]] || { sup.usage; exit 1; }
+		(( $# )) || {
+			sup.usage
+			return 1
+		}
+
+		target="$1"
 
 		if sup.if_url "$target"; then
-			file=`sup.mktemp "$cfg_tmp_dir"`
+			file=$(sup.mktemp "$cfg_tmp_dir")
 
-			curl -s "$target" > "$file" || {
+			curl -skL "$target" > "$file" || {
 				sup.err "Could not download file."
 				return 1
 			}
 		else
 			file="$target"
+
+			[[ -f "$file" ]] || {
+				sup.err "No such file: ${file}"
+				return 1
+			}
 		fi
 	fi
 
 	sup.upload
 }
 
-main $(sup.getopt "$@")
+sup.set_argv "$@"
+main "${argv[@]}"