atom

@@ -1,17 +1,15 @@
 #!/usr/bin/env bash
 
-declare -r				\
-	DOCDIR=%DOCDIR%			\
-	LIBDIR=%LIBDIR%			\
-	SHAREDIR=%SHAREDIR%
-declare -r				\
-	exampleconf=$DOCDIR/example.cfg	\
-	schema=$SHAREDIR/schema.sql	\
-					\
-	oldIFS="$IFS"
-
 ## Define exit codes
-source "$SHAREDIR"/errorcodes
+# General config errors [10-19]
+ELOAD=10
+EINTERVAL=11
+ENOCFG=19
+# Source cofig errors [20-29]
+# Destination config errors [30-49]
+EFORMAT=30
+ECHANNEL=31
+EFMTINVPARM=49
 
 # config structures
 declare -A			\
@@ -38,11 +36,21 @@ declare -A			\
 	exit $EBASHVERS
 }
 
+declare -r				\
+	DOCDIR=%DOCDIR%			\
+	LIBDIR=%LIBDIR%			\
+	SHAREDIR=%SHAREDIR%
+declare -r				\
+	exampleconf=$DOCDIR/example.cfg	\
+	schema=$SHAREDIR/schema.sql	\
+					\
+	oldIFS="$IFS"
+
 LC_ALL=C
 
 shopt -s extglob
 
-source "$SHAREDIR"/id3genres
+source $SHAREDIR/id3genres
 
 for function in "$LIBDIR"/*/*
 do
@@ -117,12 +125,12 @@ do
 		:)
 			echo "-$OPTARG requires an argument"
 			help
-			exit $EINVARG
+			exit 127
 		;;
 		*)
 			echo "Unrecognized option: -$OPTARG"
 			help
-			exit $EINVARG
+			exit 127
 		;;
 	esac
 done

lib/database/checkVersion

@@ -18,7 +18,7 @@ checkDatabaseVersion() {
 			echo "Database schema version $dbversion is higher than
 				that of this version of AtOM
 				($currentdbversion). Bailing out." >&2
-			exit $EDBVERSION
+			exit 1
 		fi
 	else
 		Insert atom 1 <<<"version $currentdbversion"

lib/workers/master

@@ -220,7 +220,7 @@ master() {
 				echo "Waiting for children to come back home..."
 				wait
 				echo $'\nGood luck!'
-				exit $ETASKLEFT
+				exit 1
 			elif (( ready == 0 ))
 			then
 				sleep 0.1

share/errorcodes

@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-## Define exit codes
-# General config errors [10-19]
-EDBVERSION=10
-ELOAD=11
-EINTERVAL=12
-ELOAD=13
-EIONICE=14
-ENOCFG=19
-# Source cofig errors [20-29]
-# Destination config errors [30-49]
-EFORMAT=30
-ECHANNEL=31
-EQUALITY=32
-EMAXBPS=33
-EINVDEST=34
-EFMTINVPARM=49
-# Tasks
-ETASKLEFT=50
-# Sanity
-ESANITY=60
-# Invalid arguments
-EINVARG=127

toys/checkextensions

@@ -8,19 +8,6 @@ EOWarn
 
 read -p "Press Enter to continue or Ctrl-C to abort"
 
-declare -r				\
-	DOCDIR=%DOCDIR%			\
-	LIBDIR=%LIBDIR%			\
-	SHAREDIR=%SHAREDIR%
-declare -r				\
-	exampleconf=$DOCDIR/example.cfg	\
-	schema=$SHAREDIR/schema.sql	\
-					\
-	oldIFS="$IFS"
-
-## Define exit codes
-source "$SHAREDIR"/errorcodes
-
 # config structures
 declare -A			\
 	destinationchannels	\
@@ -43,6 +30,16 @@ declare -A			\
 	exit $EBASHVERS
 }
 
+declare -r				\
+	DOCDIR=%DOCDIR%			\
+	LIBDIR=%LIBDIR%			\
+	SHAREDIR=%SHAREDIR%
+declare -r				\
+	exampleconf=$DOCDIR/example.cfg	\
+	schema=$SHAREDIR/schema.sql	\
+					\
+	oldIFS="$IFS"
+
 LC_ALL=C
 
 shopt -s extglob

toys/checkgenre

@@ -1,18 +1,5 @@
 #!/usr/bin/env bash
 
-declare -r				\
-	DOCDIR=%DOCDIR%			\
-	LIBDIR=%LIBDIR%			\
-	SHAREDIR=%SHAREDIR%
-declare -r				\
-	exampleconf=$DOCDIR/example.cfg	\
-	schema=$SHAREDIR/schema.sql	\
-					\
-	oldIFS="$IFS"
-
-## Define exit codes
-source "$SHAREDIR"/errorcodes
-
 # config structures
 declare -A			\
 	destinationchannels	\
@@ -35,6 +22,16 @@ declare -A			\
 	exit $EBASHVERS
 }
 
+declare -r				\
+	DOCDIR=%DOCDIR%			\
+	LIBDIR=%LIBDIR%			\
+	SHAREDIR=%SHAREDIR%
+declare -r				\
+	exampleconf=$DOCDIR/example.cfg	\
+	schema=$SHAREDIR/schema.sql	\
+					\
+	oldIFS="$IFS"
+
 LC_ALL=C
 
 shopt -s extglob

toys/checkmissing

@@ -1,18 +1,5 @@
 #!/usr/bin/env bash
 
-declare -r				\
-	DOCDIR=%DOCDIR%			\
-	LIBDIR=%LIBDIR%			\
-	SHAREDIR=%SHAREDIR%
-declare -r				\
-	exampleconf=$DOCDIR/example.cfg	\
-	schema=$SHAREDIR/schema.sql	\
-					\
-	oldIFS="$IFS"
-
-## Define exit codes
-source "$SHAREDIR"/errorcodes
-
 # config structures
 declare -A			\
 	destinationchannels	\
@@ -35,6 +22,16 @@ declare -A			\
 	exit $EBASHVERS
 }
 
+declare -r				\
+	DOCDIR=%DOCDIR%			\
+	LIBDIR=%LIBDIR%			\
+	SHAREDIR=%SHAREDIR%
+declare -r				\
+	exampleconf=$DOCDIR/example.cfg	\
+	schema=$SHAREDIR/schema.sql	\
+					\
+	oldIFS="$IFS"
+
 LC_ALL=C
 
 shopt -s extglob

toys/cleandestinations

@@ -1,18 +1,5 @@
 #!/usr/bin/env bash
 
-declare -r				\
-	DOCDIR=%DOCDIR%			\
-	LIBDIR=%LIBDIR%			\
-	SHAREDIR=%SHAREDIR%
-declare -r				\
-	exampleconf=$DOCDIR/example.cfg	\
-	schema=$SHAREDIR/schema.sql	\
-					\
-	oldIFS="$IFS"
-
-## Define exit codes
-source "$SHAREDIR"/errorcodes
-
 # config structures
 declare -A			\
 	destinationchannels	\
@@ -35,6 +22,16 @@ declare -A			\
 	exit $EBASHVERS
 }
 
+declare -r				\
+	DOCDIR=%DOCDIR%			\
+	LIBDIR=%LIBDIR%			\
+	SHAREDIR=%SHAREDIR%
+declare -r				\
+	exampleconf=$DOCDIR/example.cfg	\
+	schema=$SHAREDIR/schema.sql	\
+					\
+	oldIFS="$IFS"
+
 LC_ALL=C
 
 shopt -s extglob

toys/createindex

@@ -1,17 +1,6 @@
 #!/usr/bin/env bash
 
-declare -r				\
-	DOCDIR=%DOCDIR%			\
-	LIBDIR=%LIBDIR%			\
-	SHAREDIR=%SHAREDIR%
-declare -r				\
-	exampleconf=$DOCDIR/example.cfg	\
-	schema=$SHAREDIR/schema.sql	\
-					\
-	oldIFS="$IFS"
-
-## Define exit codes
-source "$SHAREDIR"/errorcodes
+#!/bin/bash
 
 # config structures
 declare -A			\
@@ -35,6 +24,16 @@ declare -A			\
 	exit $EBASHVERS
 }
 
+declare -r				\
+	DOCDIR=%DOCDIR%			\
+	LIBDIR=%LIBDIR%			\
+	SHAREDIR=%SHAREDIR%
+declare -r				\
+	exampleconf=$DOCDIR/example.cfg	\
+	schema=$SHAREDIR/schema.sql	\
+					\
+	oldIFS="$IFS"
+
 LC_ALL=C
 
 shopt -s extglob

toys/lowquality

@@ -1,18 +1,5 @@
 #!/usr/bin/env bash
 
-declare -r				\
-	DOCDIR=%DOCDIR%			\
-	LIBDIR=%LIBDIR%			\
-	SHAREDIR=%SHAREDIR%
-declare -r				\
-	exampleconf=$DOCDIR/example.cfg	\
-	schema=$SHAREDIR/schema.sql	\
-					\
-	oldIFS="$IFS"
-
-## Define exit codes
-source "$SHAREDIR"/errorcodes
-
 # config structures
 declare -A			\
 	destinationchannels	\
@@ -35,6 +22,16 @@ declare -A			\
 	exit $EBASHVERS
 }
 
+declare -r				\
+	DOCDIR=%DOCDIR%			\
+	LIBDIR=%LIBDIR%			\
+	SHAREDIR=%SHAREDIR%
+declare -r				\
+	exampleconf=$DOCDIR/example.cfg	\
+	schema=$SHAREDIR/schema.sql	\
+					\
+	oldIFS="$IFS"
+
 LC_ALL=C
 
 shopt -s extglob

toys/missingtags

@@ -1,18 +1,5 @@
 #!/usr/bin/env bash
 
-declare -r				\
-	DOCDIR=%DOCDIR%			\
-	LIBDIR=%LIBDIR%			\
-	SHAREDIR=%SHAREDIR%
-declare -r				\
-	exampleconf=$DOCDIR/example.cfg	\
-	schema=$SHAREDIR/schema.sql	\
-					\
-	oldIFS="$IFS"
-
-## Define exit codes
-source "$SHAREDIR"/errorcodes
-
 # config structures
 declare -A			\
 	destinationchannels	\
@@ -36,6 +23,16 @@ declare -A			\
 	exit $EBASHVERS
 }
 
+declare -r				\
+	DOCDIR=%DOCDIR%			\
+	LIBDIR=%LIBDIR%			\
+	SHAREDIR=%SHAREDIR%
+declare -r				\
+	exampleconf=$DOCDIR/example.cfg	\
+	schema=$SHAREDIR/schema.sql	\
+					\
+	oldIFS="$IFS"
+
 LC_ALL=C
 
 shopt -s extglob