scripts modularized

1 files changed, 8 insertions, 10 deletions

diff --git a/scripts/br b/scripts/br
index fb07592..6802b75 100755
--- a/scripts/br
+++ b/scripts/br
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. slib
+
 help() {
 cat << EOF
 ${0}: Open links from bookmarks through dmenu
@@ -9,13 +11,8 @@ options:
 
 NOTE: bookmarks file is located at ~/.config/sites/bookmarks
 EOF
-}
 
-err() {
-	for line in "${@}"; do
-		echo "${line}" >&2
-	done
-	exit 1
+exit 0
 }
 
 alias dmenucmd="dmenu -bw 1 -c -g 1 -l 25"
@@ -24,21 +21,22 @@ alias dmenucmd="dmenu -bw 1 -c -g 1 -l 25"
 
 if [ "${#}" -eq 0 ]; then
 
+	# FIXME: Use XDG_CONFIG
 	link_file="${HOME}/.config"/sites/bookmarks.txt
 
-	command -v dmenu > /dev/null 2>&1 || err "${0}: dmenu must be installed"
+	check_program "dmenu"
 
 	[ -z "${XDG_HOME_CONFIG}" ] || link_file="${XDG_HOME_CONFIG}"/sites/bookmarks.txt
-	[ -e "${link_file}" ] || err "${0}: Couldn't find bookmarks file"
+	[ -e "${link_file}" ] || err "Couldn't find bookmarks file"
 
 	link=$(< "${link_file}" dmenucmd)
 
 	[ -z "${link}" ] || "${browser}" "${link}"
 
 elif [ "${#}" -eq 1 ]; then 
-	[ "${1}" = "-h" ] && help && exit 0
+	[ "${1}" = "-h" ] && help 
 
 	"${browser}" "${1}"
 else
-	err "${0}: Invalid usage" "Try '${0} -h' for help."
+	invalid_use
 fi