From 960fb298ff01075b13dae738c4f1188b8fc70230 Mon Sep 17 00:00:00 2001
From: Salt <rehashedsalt@cock.li>
Date: Sun, 16 Sep 2018 12:18:41 -0500
Subject: [PATCH] Lots: Miscellaneous style changes

---
 cconvert           | 2 +-
 fetch              | 5 +++--
 mklatex            | 2 +-
 test-notifications | 1 +
 tubetop            | 2 +-
 tubetop2           | 2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/cconvert b/cconvert
index b3156a5..2905ab1 100755
--- a/cconvert
+++ b/cconvert
@@ -1,2 +1,2 @@
-#!/bin/bash
+#!/usr/bin/env bash
 printf "%d %d %d\n" 0x${1:0:2} 0x${1:2:2} 0x${1:4:2}
diff --git a/fetch b/fetch
index 121d719..b1d55df 100755
--- a/fetch
+++ b/fetch
@@ -1,5 +1,6 @@
 #!/bin/sh
-if `which neofetch > /dev/null 2>&1`; then
+name="$(basename $0 .sh)"
+if $(which neofetch > /dev/null 2>&1); then
 	neofetch\
 		--disable model resolution\
 		--block_range 0 15\
@@ -7,5 +8,5 @@ if `which neofetch > /dev/null 2>&1`; then
 		--xoffset 4 --yoffset 4
 	scrot "$HOME/Pictures/Screenshots/neofetch-`date +%s`.png"
 else
-	printf 'fetch: Neofetch is not installed; aborting\n'
+	printf "$name: Neofetch is not installed; aborting\n"
 fi
diff --git a/mklatex b/mklatex
index 3303dd1..d0e36fc 100755
--- a/mklatex
+++ b/mklatex
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Copyright (c) 2017 rehashedsalt/vintagesalt
 # 
diff --git a/test-notifications b/test-notifications
index 479c9e1..5e52fad 100755
--- a/test-notifications
+++ b/test-notifications
@@ -1,4 +1,5 @@
 #!/bin/sh
+which notify-send > /dev/null 2>&1 || exit 1
 notify-send -u low "Low Urgency Notification" "This is a simple test notification with low urgency. It's okay to ignore me, I guess."
 notify-send -u normal "Normal Urgency Notification" "This is another simple test notification with normal urgency. My information will help you work."
 notify-send -u critical "High Urgency Notification" "This notification really should grab your attention! It's important!"
diff --git a/tubetop b/tubetop
index 23d2ab8..3e7ca71 100755
--- a/tubetop
+++ b/tubetop
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Copyright (c) 2017 rehashedsalt/vintagesalt
 # 
diff --git a/tubetop2 b/tubetop2
index c2e7fe3..bb4373e 100755
--- a/tubetop2
+++ b/tubetop2
@@ -1,4 +1,4 @@
-#! /bin/bash
+#!/usr/bin/env bash
 #
 # tubetop2
 # Copyright (C) 2018 rehashedsalt <salt@lap-th-e560-0>