SVN: livecd/mklive/mklive

[caleb]

Author: caleb
Date: Wed Aug  8 14:54:58 2012
New Revision: 12577

Modified:
   livecd/mklive/mklive
Log:
- Default value needs to be set for both compression variables, not just one otherwise mksquashfs doesn't get a value it can use.
- Minor English and whitespace cleanup.

Modified: livecd/mklive/mklive
==============================================================================
--- livecd/mklive/mklive	(original)
+++ livecd/mklive/mklive	Wed Aug  8 14:54:58 2012
@@ -4,7 +4,6 @@
 # PLD-Linux distribution
 #
 
-
 # check kernel release
 function get_src_kernel_rel 
 {
@@ -163,7 +162,7 @@
 	echo "  --bootsplash=config - enable bootsplash (default no)"
 	echo ""
 	echo "  mklive script creates a live cd/dvd system based on PLD-Linux"
-	echo "  installed into directory."
+	echo "  installed into a directory."
 	echo " example 1:"
 	echo "  # mklive /my-sys-dir /my-live.iso"
 	echo " example 2:"
@@ -172,9 +171,9 @@
 }
 function make_cleanup
 {
-        echo "Running cleanup of $1..."
-        find $1 -name \*~ -exec rm \{\} \;
-        find $1 -name .svn -type d -exec rm -rf \{\} \; 2> /dev/null
+	echo "Running cleanup of $1..."
+	find $1 -name \*~ -exec rm \{\} \;
+	find $1 -name .svn -type d -exec rm -rf \{\} \; 2> /dev/null
 }
 
 
@@ -183,9 +182,9 @@
 bootsplash_arg=0
 for arg in $@
 do
-        case $arg in
-                --lzma) compr=lzma; squashfscompr=xz  ;;
-                --gzip) compr=gzip; squashfscompr=gzip ;;
+	case $arg in
+		--lzma) compr=lzma; squashfscompr=xz  ;;
+		--gzip) compr=gzip; squashfscompr=gzip ;;
 		--tpl=*) templatesDir=$(echo $arg | sed 's/.*tpl=//;s/--.*//') ;;
 		--bootsplash=*)
 			bootsplash_arg=1
@@ -195,22 +194,23 @@
 			print_help
 			exit 0
 		;;
-                -*)
+		-*)
 			echo "Invalid option: $arg. Use -h to print help"
 			print_help
 			exit 1
 		;;
-                *)
-                        [ -z $sys_source ] && sys_source=$arg && continue
-                        [ -z $dst_iso ] && [ ! -z $sys_source ] && dst_iso=$arg        
-                ;;
-        esac
+		*)
+				[ -z $sys_source ] && sys_source=$arg && continue
+				[ -z $dst_iso ] && [ ! -z $sys_source ] && dst_iso=$arg        
+		;;
+	esac
 done
 [ ! $(whoami) = 'root' ] && die "You need superuser privileges, try 'su' or 'sudo'"
 
 [ -z $sys_source ] && die "Missing arg: source directory. Use -h to print help."
 [ -z $dst_iso ] && die "Missing arg: iso image. Use -h to print help"
 [ -z $compr ] && compr=gzip # gzip is default compression method
+[ -z $squashfscompr ] && squashfscompr=gzip # gzip is default compression method
 [ ! -d $sys_source ] && die "$sys_source is not a directory"
 mkroot=$(dirname $0)