kinect_fetch_fw: declare FIRMWARE_PATH earlier and use it when installing

[kinect-audio-setup.git] / kinect_fetch_fw

diff --git a/kinect_fetch_fw b/kinect_fetch_fw
index a358327..47f7b44 100755 (executable)
--- a/kinect_fetch_fw
+++ b/kinect_fetch_fw
@@ -12,6 +12,9 @@
 #
 # wget and 7z from p7zip-full are needed, they can be installed with
 #   sudo aptitude install wget 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
 


@@ -19,7 +22,7 @@ SDK_URL=${SDK_URL:-"http://download.microsoft.com/download/F/9/9/F99791F2-D5BE-4
 SDK_MD5="40764fe9e00911bda5095e5be777e311"
 
 [ $# -lt 1 ] && { echo "usage: $(basename "$0") <firmware destdir> [<path of kinect_upload_fw binary>]" 1>&2; exit 1; }
 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)
+FW_DESTDIR=$(readlink -m $1)

 LOADER_PATH=${2:-"/usr/local/sbin/kinect_upload_fw"}
 
 command -v wget >/dev/null 2>&1 || { echo "$(basename "$0"): command 'wget' is needed." 1>&2 ; exit 1; }
 LOADER_PATH=${2:-"/usr/local/sbin/kinect_upload_fw"}
 
 command -v wget >/dev/null 2>&1 || { echo "$(basename "$0"): command 'wget' is needed." 1>&2 ; exit 1; }


@@ -36,7 +39,7 @@ Kinect Sensor device from the Microsoft Kinect for Windows SDK:
 http://kinectforwindows.org/
 
 The full license of the SDK can be found at:
 http://kinectforwindows.org/
 
 The full license of the SDK can be found at:

-http://www.kinectforwindows.org/download/EULA.htm
+http://research.microsoft.com/en-us/um/legal/kinectsdk-tou_noncommercial.htm

 
 EOM
 
 
 EOM
 


@@ -56,15 +59,14 @@ echo -n "Extracting the UAC firmware..."
 echo " done."
 
 FW_FILE=$(ls UACFirmware.* | cut -d ' ' -f 1)
 echo " done."
 
 FW_FILE=$(ls UACFirmware.* | cut -d ' ' -f 1)

-
-install -d "${DESTDIR}${FW_DESTDIR}"
-install -m 644 "$FW_FILE" "${DESTDIR}${FW_DESTDIR}"
-

 FIRMWARE_PATH=$FW_DESTDIR/$(basename "$FW_FILE")
 
 FIRMWARE_PATH=$FW_DESTDIR/$(basename "$FW_FILE")
 

-if [ -f "${DESTDIR}/lib/udev/rules.d/55-kinect_audio.rules" ];
+install -d "$FW_DESTDIR"
+install -m 644 "$FW_FILE" "$FIRMWARE_PATH"
+
+if [ -f "/lib/udev/rules.d/55-kinect_audio.rules" ];

 then
   sed -e "s|@LOADER_PATH@|$LOADER_PATH|g" \
       -e "s|@FIRMWARE_PATH@|$FIRMWARE_PATH|g" \
 then
   sed -e "s|@LOADER_PATH@|$LOADER_PATH|g" \
       -e "s|@FIRMWARE_PATH@|$FIRMWARE_PATH|g" \

-      -i "${DESTDIR}/lib/udev/rules.d/55-kinect_audio.rules"
+      -i "/lib/udev/rules.d/55-kinect_audio.rules"

 fi
 fi