add missing file: include/wimlib/alloca.h

[wimlib] / programs / mkwinpeimg.in

diff --git a/programs/mkwinpeimg.in b/programs/mkwinpeimg.in
index cb997fe128f39968a46d506bf23884ffecf8b067..ea0396ebc91952a56281e96fde162ef42936c3eb 100755 (executable)
--- a/programs/mkwinpeimg.in
+++ b/programs/mkwinpeimg.in
@@ -18,10 +18,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 

-script_name="$(basename $0)"
+script_name="$(basename "$0")"

 PREFIX_REG="::"
 WIMLIB_VERSION=@VERSION@
 PREFIX_REG="::"
 WIMLIB_VERSION=@VERSION@

-imagex=@IMAGEX_PROGNAME@

 
 calc_columns () {
        STAT_COL=80
 
 calc_columns () {
        STAT_COL=80


@@ -116,7 +115,7 @@ EOF
 }
 
 version() {
 }
 
 version() {

-       echo "$script_name (wimlib $WIMLIB_VERSION)"
+       echo "$script_name (distributed with wimlib $WIMLIB_VERSION)"

        exit 0
 }
 
        exit 0
 }
 


@@ -148,7 +147,7 @@ process_command_line() {
                        windows_dir="$2"
                        windows_dir_specified=yes
                        if [ -n "$waik_dir" ]; then
                        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
                                exit 1
                        fi
                        shift


@@ -156,7 +155,7 @@ process_command_line() {
                -A|--waik-dir)
                        waik_dir="$2"
                        if [ -n "$windows_dir" ]; then
                -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
                                exit 1
                        fi
                        shift


@@ -192,7 +191,7 @@ process_command_line() {
                                arch="AMD64"
                                arch_id="3"
                        else
                                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
                                exit 1
                        fi
                        shift


@@ -209,7 +208,7 @@ process_command_line() {
                        break
                        ;;
                *)
                        break
                        ;;
                *)

-                       echo "Invalid option \"$1\""
+                       echo 1>&2 "Invalid option \"$1\""

                        usage
                        exit 1
                        ;;
                        usage
                        exit 1
                        ;;


@@ -218,8 +217,8 @@ process_command_line() {
        done
 
        if [ $# -ne 1 ]; then
        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"
                exit 1
        else
                image="$1"


@@ -236,17 +235,17 @@ find_windows_dir() {
        fi
        if [ ! -d "$windows_dir" ]; then
                if [ -z "$windows_dir_specified" ]; then
        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
 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
                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
 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
 
 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
 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
 
        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
 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
                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
 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
                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.
 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
 
        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
 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\""
                        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
                                                --boot "$boot_wim" || stat_fail
                        stat_done
                fi


@@ -408,13 +407,13 @@ modify_boot_wim() {
 
        if [ -n "$start_script" ]; then
                stat_busy "Setting \"$start_script\" as the script to be executed when Windows PE boots"
 
        if [ -n "$start_script" ]; then
                stat_busy "Setting \"$start_script\" as the script to be executed when Windows PE boots"

-               cp "$start_script" "$tmp_dir/$start_script"
+               start_script_base="$(basename "$start_script")"

                cat > "$tmp_dir/__mkwinpeimg.winpeshl.ini" <<- EOF
                        [LaunchApps]
                cat > "$tmp_dir/__mkwinpeimg.winpeshl.ini" <<- EOF
                        [LaunchApps]

-                       %SYSTEMDRIVE%\\$start_script
+                       %SYSTEMDRIVE%\\$start_script_base

                EOF
                cat 1>&3 <<- EOF
                EOF
                cat 1>&3 <<- EOF

-                       add '$tmp_dir/$start_script' '/$start_script'
+                       add '$start_script' '/$start_script_base'

                        delete --force /Windows/System32/winpeshl.ini
                        add '$tmp_dir/__mkwinpeimg.winpeshl.ini' /Windows/System32/winpeshl.ini
                EOF
                        delete --force /Windows/System32/winpeshl.ini
                        add '$tmp_dir/__mkwinpeimg.winpeshl.ini' /Windows/System32/winpeshl.ini
                EOF


@@ -432,7 +431,7 @@ modify_boot_wim() {
        exec 3>&-
 
        stat_busy "Rebuilding WIM with changes made"
        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
 }
                < "$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  \
 
        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
 }
 
        stat_done
 }


@@ -473,11 +472,26 @@ make_disk_img() {
 
        export MTOOLSRC="$mtool_conf"
 
 
        export MTOOLSRC="$mtool_conf"
 

-       mformat -h 255 -s 63 -T $(( image_size / 512)) s:
-       mcopy -s "$tmp_dir"/* s:
+       mformat -h 255 -s 63 -T $(( image_size / 512)) s: || stat_fail
+       mcopy -s "$tmp_dir"/* s: || stat_fail

 
        syslinux --install "$image"
 
        syslinux --install "$image"

-       mcopy /usr/lib/syslinux/chain.c32 s:
+
+       syslinuxdir="/usr/lib/syslinux"
+
+       if [ -d "$syslinuxdir/bios" ]; then
+               biosdir="$syslinuxdir/bios"
+       else
+               biosdir="$syslinuxdir"
+       fi
+
+       mcopy "$biosdir/chain.c32" s: || stat_fail
+       if [ -e "$biosdir/libcom32.c32" ]; then
+               mcopy "$biosdir/libcom32.c32" s:
+       fi
+       if [ -e "$biosdir/libutil.c32" ]; then
+               mcopy "$biosdir/libutil.c32" s:
+       fi

        mcopy - 's:syslinux.cfg' <<- EOF
                DEFAULT winpe
                LABEL   winpe
        mcopy - 's:syslinux.cfg' <<- EOF
                DEFAULT winpe
                LABEL   winpe


@@ -491,6 +505,22 @@ make_disk_img() {
 calc_columns
 tmp_dir="$(mktemp -d)"
 process_command_line "$@"
 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
 if [ -z "$waik_dir" ]; then
        find_windows_dir
 fi


@@ -523,4 +553,6 @@ elif [ $make = disk ]; then
        make_disk_img "$image"
 fi
 
        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