kinect_upload_fw: rename "res" to "ret" in main()

[kinect-audio-setup.git] / kinect_fetch_fw

diff --git a/kinect_fetch_fw b/kinect_fetch_fw
index 6db228f..28a9fe7 100755 (executable)
--- a/kinect_fetch_fw
+++ b/kinect_fetch_fw
@@ -10,13 +10,16 @@
 # To Public License, Version 2, as published by Sam Hocevar. See
 # http://sam.zoy.org/wtfpl/COPYING for more details.
 #
 # To Public License, Version 2, as published by Sam Hocevar. See
 # http://sam.zoy.org/wtfpl/COPYING for more details.
 #

-# 7z from p7zip-full is needed, it can be installed with
-#   sudo aptitude install p7zip-full
+# wget and 7z from p7zip-full are needed, they can be installed with
+#   sudo aptitude install wget p7zip-full
+#
+# NOTE: p7zip-full >= 9.20 is required in order to extract .msi files
+#       correctly

 
 set -e
 
 
 set -e
 

-SDK_URL=${SDK_URL:-"http://download.microsoft.com/download/8/4/C/84C9EF40-EE49-42C2-AE26-C6E30921182F/KinectSDK32.msi"}
-SDK_MD5="a043c40f35bf14a5139dfbf6cb14f687"
+SDK_URL=${SDK_URL:-"http://download.microsoft.com/download/F/9/9/F99791F2-D5BE-478A-B77A-830AD14950C3/KinectSDK-v1.0-beta2-x86.msi"}
+SDK_MD5="40764fe9e00911bda5095e5be777e311"

 
 [ $# -lt 1 ] && { echo "usage: $(basename "$0") <firmware destdir> [<path of kinect_upload_fw binary>]" 1>&2; exit 1; }
 FW_DESTDIR=$(readlink -f $1)
 
 [ $# -lt 1 ] && { echo "usage: $(basename "$0") <firmware destdir> [<path of kinect_upload_fw binary>]" 1>&2; exit 1; }
 FW_DESTDIR=$(readlink -f $1)


@@ -29,6 +32,17 @@ TEMPDIR=$(mktemp -d)
 trap 'rm -rf "$TEMPDIR" >/dev/null 2>&1' 0
 trap "exit 2" 1 2 3 15
 
 trap 'rm -rf "$TEMPDIR" >/dev/null 2>&1' 0
 trap "exit 2" 1 2 3 15
 

+cat << EOM
+
+This script is going to download the UAC Firmware for the Microsoft 
+Kinect Sensor device from the Microsoft Kinect for Windows SDK:
+http://kinectforwindows.org/
+
+The full license of the SDK can be found at:
+http://www.kinectforwindows.org/download/EULA.htm
+
+EOM
+

 cd "$TEMPDIR"
 ARCHIVE_NAME=$(basename "$SDK_URL")
 rm -f "$ARCHIVE_NAME" && wget "$SDK_URL" -O "$ARCHIVE_NAME"
 cd "$TEMPDIR"
 ARCHIVE_NAME=$(basename "$SDK_URL")
 rm -f "$ARCHIVE_NAME" && wget "$SDK_URL" -O "$ARCHIVE_NAME"


@@ -40,7 +54,9 @@ then
   exit 1
 fi
 
   exit 1
 fi
 

-7z e -y -r "$ARCHIVE_NAME" "UACFirmware.*"
+echo -n "Extracting the UAC firmware..."
+7z e -y -r "$ARCHIVE_NAME" "UACFirmware.*" > /dev/null
+echo " done."

 
 FW_FILE=$(ls UACFirmware.* | cut -d ' ' -f 1)
 
 
 FW_FILE=$(ls UACFirmware.* | cut -d ' ' -f 1)