modified error handling methods

[feisty_meow.git] / scripts / system / add_swap_mount.sh

diff --git a/scripts/system/add_swap_mount.sh b/scripts/system/add_swap_mount.sh
index f1c019ea51389a355deaa22793d32755a871663c..dc14f84e31ac97bc4ed80c65677cf68e86003392 100644 (file)
--- a/scripts/system/add_swap_mount.sh
+++ b/scripts/system/add_swap_mount.sh
@@ -1,8 +1,9 @@
 #!/bin/bash
 
 # auto-find the scripts, since we might want to run this as sudo.
-export WORKDIR="$( \cd "$(\dirname "$0")" && /bin/pwd )"  # obtain the script's working directory.
-source "$WORKDIR/../core/launch_feisty_meow.sh"
+export THISDIR="$( \cd "$(\dirname "$0")" && /bin/pwd )"  # obtain the script's working directory.
+export FEISTY_MEOW_APEX="$( \cd "$THISDIR/../.." && \pwd )"
+source "$FEISTY_MEOW_APEX/scripts/core/launch_feisty_meow.sh"
 
 if [[ $EUID != 0 ]]; then
   echo "This script must be run as root or sudo."
@@ -16,12 +17,13 @@ SWAP_SIZE="$1"; shift
 
 if [ "$SWAP_INSTANCE" == "--help" ]; then
   echo "\
+$(basename $0):
 This script will add a swap partition for Linux that uses hard drive space for
 swap memory.  This increases the amount of available memory on RAM constrained
 systems.  It accepts two parameters: (1) the instance of the swap file, which
 should be a small number not already used for a swap partition, and (2) the
 size of the swap file in megabytes."
-  exit 1
+  exit 0
 fi
 
 # if the swap instance variable is already set, then we'll use it.
@@ -37,16 +39,16 @@ if [ -z "$SWAP_SIZE" ]; then
 fi
 
 /bin/dd if=/dev/zero of=/var/swap.${SWAP_INSTANCE} bs=1M count=${SWAP_SIZE}
-test_or_die "creating swap file"
+exit_on_error "creating swap file"
 
 /bin/chmod 600 /var/swap.${SWAP_INSTANCE}
-test_or_die "setting swap file permissions"
+exit_on_error "setting swap file permissions"
 
 /sbin/mkswap /var/swap.${SWAP_INSTANCE}
-test_or_die "formatting swap file as swap partition"
+exit_on_error "formatting swap file as swap partition"
 
 /sbin/swapon /var/swap.${SWAP_INSTANCE}
-test_or_die "enabling new swap partition"
+exit_on_error "enabling new swap partition"
 
 free