From b1aa9f7c1fa637d4a4edb60b5560e0e1e3715bea Mon Sep 17 00:00:00 2001
From: Marc Herbert <marc.herbert@intel.com>
Date: Thu, 6 May 2021 11:14:54 -0700
Subject: [PATCH 1/3] tools-v1.7: add missing +x permission

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
---
 tools-v1.7/sof-ctl    | Bin
 tools-v1.7/sof-fuzzer | Bin
 tools-v1.7/sof-logger | Bin
 tools-v1.7/sof-probes | Bin
 4 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 tools-v1.7/sof-ctl
 mode change 100644 => 100755 tools-v1.7/sof-fuzzer
 mode change 100644 => 100755 tools-v1.7/sof-logger
 mode change 100644 => 100755 tools-v1.7/sof-probes

diff --git a/tools-v1.7/sof-ctl b/tools-v1.7/sof-ctl
old mode 100644
new mode 100755
diff --git a/tools-v1.7/sof-fuzzer b/tools-v1.7/sof-fuzzer
old mode 100644
new mode 100755
diff --git a/tools-v1.7/sof-logger b/tools-v1.7/sof-logger
old mode 100644
new mode 100755
diff --git a/tools-v1.7/sof-probes b/tools-v1.7/sof-probes
old mode 100644
new mode 100755

From dd14a487fcc7cb95aeb0a081d7d35b5a3340c126 Mon Sep 17 00:00:00 2001
From: Marc Herbert <marc.herbert@intel.com>
Date: Thu, 6 May 2021 11:02:06 -0700
Subject: [PATCH 2/3] Rename README.md to README-before-v1.7.md

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
---
 README.md => README-before-1.7.md | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename README.md => README-before-1.7.md (100%)

diff --git a/README.md b/README-before-1.7.md
similarity index 100%
rename from README.md
rename to README-before-1.7.md

From fa3186423eb59b6f70310006f7ca8d7b58485509 Mon Sep 17 00:00:00 2001
From: Marc Herbert <marc.herbert@intel.com>
Date: Thu, 6 May 2021 11:02:31 -0700
Subject: [PATCH 3/3] New README.md and install.sh for v1.7

Fixes #38

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
---
 README.md  | 31 +++++++++++++++++++++++++++++++
 install.sh | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 79 insertions(+)
 create mode 100644 README.md
 create mode 100755 install.sh

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..a010f14
--- /dev/null
+++ b/README.md
@@ -0,0 +1,31 @@
+Starting from v1.7 the installation process has been simplified and
+the go.sh script is not used anymore. Instead:
+
+```
+sudo mv /lib/firmware/intel/sof* some_backup_location/
+sudo mv /usr/local/bin/sof-*     some_backup_location/ # optional
+sudo install.sh v1.7
+```
+
+The go.sh script still applies to older releases.
+
+You don't have to use install.sh, you can use any recursive copy of
+your preference. This is all what install.sh does:
+
+```
+rsync -a sof*v1.7   /lib/firmware/intel/
+ln -s sof-v1.7      /lib/firmware/intel/sof
+ln -s sof-tplg-v1.7 /lib/firmware/intel/sof-tplg
+rsync tools-v1.7/* /usr/local/bin
+```
+
+If you don't want the symbolic links:
+
+```
+rsync -a sof-v1.7/       /lib/firmware/intel/sof/
+rsync -a sof-tplg-v1.7/  /lib/firmware/intel/sof-tplg/
+rsync tools-v1.7/        /usr/local/bin/
+```
+
+Remember that for rsync (and some versions of `cp`), a trailing slash in
+srcdir/ is rougly equivalent to srcdir/*
diff --git a/install.sh b/install.sh
new file mode 100755
index 0000000..6167554
--- /dev/null
+++ b/install.sh
@@ -0,0 +1,48 @@
+#!/bin/sh
+
+set -e
+
+# Default values, override on the command line
+: "${FW_DEST:=/lib/firmware/intel}"
+: "${TOOLS_DEST:=/usr/local/bin}"
+
+usage()
+{
+    cat <<EOF
+Usage:
+        sudo $0 v1.7
+EOF
+    exit 1
+}
+
+main()
+{
+    test "$#" -eq 1 || usage
+
+    local ver="$1"
+
+    # Do this first so we can fail immediately and not leave a
+    # half-install behind
+    set -x
+    for sdir in sof sof-tplg; do
+        ln -s "$sdir-$ver" "${FW_DEST}/$sdir" || {
+            set +x
+            die '%s already installed? (Re)move it first.\n' "${FW_DEST}/$sdir"
+        }
+    done
+
+    # Trailing slash in srcdir/ ~= srcdir/*
+    rsync -a sof*"$ver" "${FW_DEST}"/
+    rsync -a tools-"$ver"/ "${TOOLS_DEST}"/
+}
+
+die()
+{
+    >&2 printf '%s ERROR: ' "$0"
+    # We want die() to be usable exactly like printf
+    # shellcheck disable=SC2059
+    >&2 printf "$@"
+    exit 1
+}
+
+main "$@"