From 37788be5d97cf9c32be1abae76fddc77f4ea87f6 Mon Sep 17 00:00:00 2001
From: Luke Smith <luke@lukesmith.xyz>
Date: Sat, 18 Apr 2020 10:33:58 -0400
Subject: [PATCH] ifinstalled now checks for packages, iplocate fix, sleep
 removed from torwrap

---
 .local/bin/ifinstalled        | 8 ++++++--
 .local/bin/statusbar/iplocate | 4 ++--
 .local/bin/torwrap            | 6 +++---
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.local/bin/ifinstalled b/.local/bin/ifinstalled
index c8e1c2e..04c0eef 100755
--- a/.local/bin/ifinstalled
+++ b/.local/bin/ifinstalled
@@ -1,4 +1,8 @@
 #!/bin/sh
 
-# If $1 command is not available, error code and notify.
-command -v "$1" >/dev/null || { notify-send "📦 $1" "must be installed for this function." && exit 1 ;}
+# Some optional functions in LARBS require programs not installed by default. I
+# use this little script to check to see if a command exists and if it doesn't
+# it informs the user that they need that command to continue. This is used in
+# various other scripts for clarity's sake.
+
+pacman -Qq "$1" >/dev/null || { notify-send "📦 $1" "must be installed for this function." && exit 1 ;}
diff --git a/.local/bin/statusbar/iplocate b/.local/bin/statusbar/iplocate
index 8dc6290..02adab8 100755
--- a/.local/bin/statusbar/iplocate
+++ b/.local/bin/statusbar/iplocate
@@ -5,6 +5,6 @@
 #
 # https://www.maketecheasier.com/ip-address-geolocation-lookups-linux/
 
-ifinstalled "geoiplookup" || exit
+ifinstalled "geoip" || exit
 addr="$(curl ifconfig.me 2>/dev/null)" || exit
-grep "flag: " ${XDG_CONFIG_HOME:-$HOME/.config}/emoji | grep "$(geoiplookup $addr | sed 's/.*, //')" | sed "s/flag: //;s/;.*//"
+grep "flag: " "${XDG_DATA_HOME:-$HOME/.local/share}/larbs/emoji" | grep "$(geoiplookup "$addr" | sed 's/.*, //')" | sed "s/flag: //;s/;.*//"
diff --git a/.local/bin/torwrap b/.local/bin/torwrap
index 82a268a..4f94053 100755
--- a/.local/bin/torwrap
+++ b/.local/bin/torwrap
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-ifinstalled tremc transmission-cli || exit
+ifinstalled tremc-git transmission-cli || exit
 
-! ps ax | grep -q "\stransmission-daemon$" && transmission-daemon && notify-send "Starting torrent daemon..." && sleep 3 && pkill -RTMIN+7 "${STATUSBAR:-dwmblocks}" &
+! pidof transmission-daemon >/dev/null && transmission-daemon && notify-send "Starting torrent daemon..."
 
-$TERMINAL -e tremc
+$TERMINAL -e tremc; pkill -RTMIN+7 "${STATUSBAR:-dwmblocks}"