From 6a30fa54df69f0a882de2410b23f299d96888afe Mon Sep 17 00:00:00 2001
From: Georgiy Ignatov <vBLFTePebWNi6c@gmail.com>
Date: Thu, 14 May 2020 09:38:27 +0300
Subject: [PATCH 1/4] Add more descriptive info about driver version detection
 failure #267

---
 patch.sh | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/patch.sh b/patch.sh
index d4d5907..f7a2142 100755
--- a/patch.sh
+++ b/patch.sh
@@ -183,9 +183,15 @@ patch_common () {
         exit 1
     fi
 
-    if ! driver_version=$("$NVIDIA_SMI" --query-gpu=driver_version --format=csv,noheader,nounits | head -n 1) ; then
-        echo 'Something went wrong. Check nvidia driver'
-        exit 1
+    cmd="$NVIDIA_SMI --query-gpu=driver_version --format=csv,noheader,nounits"
+    driver_versions_list=$($cmd)
+    ret_code=$?
+    driver_version=$(echo "$driver_versions_list" | head -n 1)
+    if [ $ret_code -ne 0 ] && [ -nz driver_version ] ; then
+        echo "Can not detect nvidia driver version."
+        echo "CMD: \"$cmd\""
+        echo "Result: \"$driver_versions_list\""
+        echo "nvidia-smi retcode: $ret_code"
     fi
 
     echo "Detected nvidia driver version: $driver_version"

From 206731fbc3a46332df5515735d5494c4311d3414 Mon Sep 17 00:00:00 2001
From: Georgiy Ignatov <vBLFTePebWNi6c@gmail.com>
Date: Thu, 14 May 2020 10:43:32 +0300
Subject: [PATCH 2/4] fix missing exit

---
 patch.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/patch.sh b/patch.sh
index f7a2142..0b11abb 100755
--- a/patch.sh
+++ b/patch.sh
@@ -192,6 +192,7 @@ patch_common () {
         echo "CMD: \"$cmd\""
         echo "Result: \"$driver_versions_list\""
         echo "nvidia-smi retcode: $ret_code"
+        exit 1
     fi
 
     echo "Detected nvidia driver version: $driver_version"

From 9f7e57c3a8c9ac997e6863148cfe023debf9701e Mon Sep 17 00:00:00 2001
From: Georgiy Ignatov <vBLFTePebWNi6c@gmail.com>
Date: Thu, 14 May 2020 13:07:45 +0300
Subject: [PATCH 3/4] fixup! Add more descriptive info about driver version
 detection failure #267

---
 patch.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/patch.sh b/patch.sh
index 0b11abb..edf2a37 100755
--- a/patch.sh
+++ b/patch.sh
@@ -187,7 +187,7 @@ patch_common () {
     driver_versions_list=$($cmd)
     ret_code=$?
     driver_version=$(echo "$driver_versions_list" | head -n 1)
-    if [ $ret_code -ne 0 ] && [ -nz driver_version ] ; then
+    if [[ $ret_code -ne 0 ]] ; then
         echo "Can not detect nvidia driver version."
         echo "CMD: \"$cmd\""
         echo "Result: \"$driver_versions_list\""

From eb68dacd63b3b5343bc14823295999dce068fac5 Mon Sep 17 00:00:00 2001
From: Georgiy Ignatov <vBLFTePebWNi6c@gmail.com>
Date: Thu, 14 May 2020 13:10:12 +0300
Subject: [PATCH 4/4] Add new driver check code to path-fbc.sh

---
 patch-fbc.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/patch-fbc.sh b/patch-fbc.sh
index 1ed2fa5..114acfc 100755
--- a/patch-fbc.sh
+++ b/patch-fbc.sh
@@ -111,8 +111,15 @@ patch_common () {
         exit 1
     fi
 
-    if ! driver_version=$("$NVIDIA_SMI" --query-gpu=driver_version --format=csv,noheader,nounits | head -n 1) ; then
-        echo 'Something went wrong. Check nvidia driver'
+    cmd="$NVIDIA_SMI --query-gpu=driver_version --format=csv,noheader,nounits"
+    driver_versions_list=$($cmd)
+    ret_code=$?
+    driver_version=$(echo "$driver_versions_list" | head -n 1)
+    if [[ $ret_code -ne 0 ]] ; then
+        echo "Can not detect nvidia driver version."
+        echo "CMD: \"$cmd\""
+        echo "Result: \"$driver_versions_list\""
+        echo "nvidia-smi retcode: $ret_code"
         exit 1
     fi