Merge pull request #8 from sfarajli/dev

Dev

1 files changed, 15 insertions, 35 deletions

diff --git a/scripts/qw b/scripts/qw
index 6732ca8..a0d5181 100755
--- a/scripts/qw
+++ b/scripts/qw
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. slib
+
 help() {
 cat << EOF
 ${0}: Qemu Wrapper, very simple script for abriviating \
@@ -10,53 +12,31 @@ options:
  -r [input.iso]		run input.iso
  -x [input.qcow2]	run input.qcow2
 EOF
-}
-
-err() {
-	for line in "${@}"; do
-		echo "${line}" >&2
-	done
-	exit 1
-}
-
-run() {
-	if ! ${1} > /dev/null 2>&1; then
-		err "${2}"
-	fi
 
-	[ -n "${3}" ] && echo "${3}"
-	exit 0
+exit 0
 }
 
-if ! command -v qemu-img > /dev/null 2>&1 || \
-   ! command -v qemu-system-x86_64 > /dev/null 2>&1; then
-	err "${0}: qemu must be properly installed"
-fi
+check_program "qemu-img"
+check_program "qemu-system-x86_64"
 
-if [ $# != 2 ] && [  $# != 1 ]; then
-	err "${0}: Invalid usage" "Try '${0} -h' for help."
-fi
+[ $# != 2 ] && [  $# != 1 ] && invalid_use
 
 while getopts "cr:x:h" option ;do
 	case "${option}" in
-	c)
-		run "qemu-img create -f qcow2 Image.img 10G" \
-			"${0}: Failed to create Image.img"
-	;;
+	c) run "qemu-img create -f qcow2 Image.img 10G" ;;
+
+	x) run "qemu-system-x86_64 -drive file=${OPTARG},format=qcow2 -enable-kvm" ;;
+
 	r)
 		run "qemu-system-x86_64 -enable-kvm -cdrom ${OPTARG} \
-			-boot menu=on -drive file=Image.img -m 4G" \
-			"${0}: Failed to run image"
-	;;
-	x)
-		run "qemu-system-x86_64 -drive file=${OPTARG},format=qcow2 -enable-kvm" \
-			"${0}: Failed to run image"
+			-boot menu=on -drive file=Image.img -m 4G"
 	;;
-	h) help; exit 0;;
+	h) help ;;
 
-	*) err "Try '${0} -h' for help." ;;
+	*) invalid_use -h ;;
 
 	esac
 done
 
-err "${0}: Invalid usage" "Try '${0} -h' for help."
+# Unreachable
+invalid_use