X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=programs%2Fmkwinpeimg.in;h=f95e8e96090b47bdcefffaa77f2d3b807b7831e4;hp=654249b24cf73f9c459145c87671caee9dceaff0;hb=151463861a212a1ae7deae7e9844cd0cd1c4343c;hpb=6c22a824ca41822f106c1d5764526ff1dfd5e87b

diff --git a/programs/mkwinpeimg.in b/programs/mkwinpeimg.in
index 654249b2..f95e8e96 100755
--- a/programs/mkwinpeimg.in
+++ b/programs/mkwinpeimg.in
@@ -21,7 +21,6 @@
 script_name="$(basename "$0")"
 PREFIX_REG="::"
 WIMLIB_VERSION=@VERSION@
-imagex=@IMAGEX_PROGNAME@
 
 calc_columns () {
 	STAT_COL=80
@@ -148,7 +147,7 @@ process_command_line() {
 			windows_dir="$2"
 			windows_dir_specified=yes
 			if [ -n "$waik_dir" ]; then
-				echo "ERROR: Cannot specify both --windows-dir and --waik-dir!"
+				echo 1>&2 "ERROR: Cannot specify both --windows-dir and --waik-dir!"
 				exit 1
 			fi
 			shift
@@ -156,7 +155,7 @@ process_command_line() {
 		-A|--waik-dir)
 			waik_dir="$2"
 			if [ -n "$windows_dir" ]; then
-				echo "ERROR: Cannot specify both --windows-dir and --waik-dir!"
+				echo 1>&2 "ERROR: Cannot specify both --windows-dir and --waik-dir!"
 				exit 1
 			fi
 			shift
@@ -192,7 +191,7 @@ process_command_line() {
 				arch="AMD64"
 				arch_id="3"
 			else
-				echo "ERROR: $2 is not a valid arch (x86/amd64)"
+				echo 1>&2 "ERROR: $2 is not a valid arch (x86/amd64)"
 				exit 1
 			fi
 			shift
@@ -209,7 +208,7 @@ process_command_line() {
 			break
 			;;
 		*)
-			echo "Invalid option \"$1\""
+			echo 1>&2 "Invalid option \"$1\""
 			usage
 			exit 1
 			;;
@@ -218,8 +217,8 @@ process_command_line() {
 	done
 
 	if [ $# -ne 1 ]; then
-		echo "You must specify the name of the image file to create!"
-		echo "Run \"$script_name -h\" to see usage information."
+		echo 1>&2 "You must specify the name of the image file to create!"
+		echo 1>&2 "Run \"$script_name -h\" to see usage information."
 		exit 1
 	else
 		image="$1"
@@ -236,17 +235,17 @@ find_windows_dir() {
 	fi
 	if [ ! -d "$windows_dir" ]; then
 		if [ -z "$windows_dir_specified" ]; then
-			cat << EOF
+			cat 1>&2 << EOF
 ERROR: Could not find the directory that the Windows 7 or 8 ISO image is mounted
 on!  Please specify this directory using the --windows-dir option.
 EOF
 		else
-			echo "ERROR: Could not find the directory \"$windows_dir\"!"
+			echo 1>&2 "ERROR: Could not find the directory \"$windows_dir\"!"
 		fi
 		exit 1
 	fi
 	if [ ! -d "$windows_dir/sources" ]; then
-		cat << EOF
+		cat 1>&2 << EOF
 ERROR: The directory "$windows_dir" exists, but it seems that the Windows 7 or 8
 ISO image is not mounted on it.  Please mount the image to continue.
 EOF
@@ -256,10 +255,10 @@ EOF
 
 check_needed_programs() {
 	if [ -z "$waik_dir" -o -n "$modify_wim" ]; then
-		if ! type -P @IMAGEX_PROGNAME@ &> /dev/null ; then
-			cat << EOF
-ERROR: To make a customized image of Windows PE, we need the "$imagex" program
-from "wimlib" so that we can modify the boot.wim file.  However, "$imagex"
+		if ! type -P wimlib-imagex &> /dev/null ; then
+			cat 1>&2 << EOF
+ERROR: To make a customized image of Windows PE, we need the wimlib-imagex program
+from "wimlib" so that we can modify the boot.wim file.  However, wimlib-imagex
 doesn't seem to be installed.  Please install "wimlib" to continue.
 EOF
 			exit 1
@@ -268,7 +267,7 @@ EOF
 
 	if [ $make = iso ]; then
 		if ! type -P mkisofs &> /dev/null ; then
-			cat << EOF
+			cat 1>&2 << EOF
 ERROR: To make a bootable ISO image of Windows PE, we need the "mkisofs"
 program, but it doesn't seem to be installed.  Please install the "cdrkit"
 package to continue, or try omitting the --iso option to make a disk image
@@ -278,7 +277,7 @@ EOF
 		fi
 	elif [ $make = disk ] ; then
 		if ! type -P syslinux &> /dev/null ; then
-			cat << EOF
+			cat 1>&2 << EOF
 ERROR: To make a bootable disk image of Windows PE, we need the "syslinux"
 program, but it doesn't seem to be installed.  Please install the "syslinux"
 package to continue, or try using the --iso option to make an ISO image instead
@@ -288,7 +287,7 @@ EOF
 		fi
 
 		if ! type -P mformat mcopy &> /dev/null; then
-			cat << EOF
+			cat 1>&2 << EOF
 ERROR: To make a bootable disk image of Windows PE, we need the "mformat" and
 "mcopy" programs from the "mtools" package.  These programs allow us to
 format a FAT filesystem and copy files to it without needing root privileges.
@@ -300,7 +299,7 @@ EOF
 
 	if [ -n "$waik_dir" ] &&  [ -f "$waik_dir"/wAIK${arch}.msi ]; then
 		if ! type -P cabextract &> /dev/null ; then
-			cat << EOF
+			cat 1>&2 << EOF
 ERROR: The boot files in the Windows Automated Installation Kit (WAIK) are
 inside cabinet archives.  To extract these files, we need the "cabextract"
 program, but it doesn't seem to be installed.  Please install "cabextract" to
@@ -378,7 +377,7 @@ get_boot_wim() {
 			remove_setup=yes
 			wim="$windows_dir/sources/boot.wim"
 			stat_busy "Exporting image from \"$wim\""
-			"$imagex" export "$windows_dir"/sources/boot.wim 2 \
+			wimlib-imagex export "$windows_dir"/sources/boot.wim 2 \
 						--boot "$boot_wim" || stat_fail
 			stat_done
 		fi
@@ -432,7 +431,7 @@ modify_boot_wim() {
 	exec 3>&-
 
 	stat_busy "Rebuilding WIM with changes made"
-	"$imagex" update "$boot_wim" --rebuild \
+	wimlib-imagex update "$boot_wim" --rebuild \
 		< "$tmp_dir/__mkwinpeimg.update.cmds" > /dev/null || stat_fail
 	stat_done
 }
@@ -446,7 +445,7 @@ make_iso_img() {
 
 	mkisofs -sysid ""  -A ""  -V "Microsoft Windows PE ($arch)"  -d -N \
 		-b etfsboot.com  -no-emul-boot   -c boot.cat  -hide etfsboot.com  \
-		-hide boot.cat -quiet -o "$image" "$tmp_dir" || stat_fail
+		-hide boot.cat -quiet -o "$image" "$tmp_dir" 1>&4 || stat_fail
 
 	stat_done
 }
@@ -506,6 +505,22 @@ make_disk_img() {
 calc_columns
 tmp_dir="$(mktemp -d)"
 process_command_line "$@"
+
+if [ "$image" = "-" ] ; then
+	# Writing image to standard output
+	if [ "$make" != iso ]; then
+		echo 1>&2 "ERROR: Writing image to standard output is only supported in --iso mode!"
+		exit 1
+	fi
+	# We can't print anything to standard output except the ISO image
+	# itself.  Play with the file descriptors.
+
+	exec 4>&1  # 4 is now the original standard output.
+	exec 1>&2  # Anything that goes to standard output now, by default,
+		   # actually goes to standard error.
+else
+	exec 4>&1  # 4 is now a copy of standard output
+fi
 if [ -z "$waik_dir" ]; then
 	find_windows_dir
 fi
@@ -513,7 +528,7 @@ if [ -n "$start_script" -o -n "$overlay" -o -n "$remove_setup" ]; then
 	modify_wim=yes
 fi
 check_needed_programs
-trap cleanup exit
+trap cleanup EXIT
 
 if [ $make != wim ]; then
 	mkdir -p "$tmp_dir"/{boot,sources}
@@ -538,4 +553,6 @@ elif [ $make = disk ]; then
 	make_disk_img "$image"
 fi
 
-echo "The image ($image) is $(stat -c %s "$image") bytes."
+if [ "$image" != "-" ]; then
+	echo "The image ($image) is $(stat -c %s "$image") bytes."
+fi