From 7f60d1bdb2610d8be58ea88558a122c26bc4eec2 Mon Sep 17 00:00:00 2001
From: matthewcroughan <matt@croughan.sh>
Date: Mon, 11 Jul 2022 18:39:36 +0100
Subject: [PATCH] flashOriginal: use shell script instead of bash function

---
 flake.nix | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/flake.nix b/flake.nix
index 572f2ce..72df145 100644
--- a/flake.nix
+++ b/flake.nix
@@ -80,23 +80,21 @@
           };
         flashOriginal =
           let
+            flashScript = pkgs.writeScript "jh7100-recover-visionfive.sh" ''
+              set -x
+              ${pkgs.lib.getExe self.packages.${system}.jh7100-recover} \
+                -D $1 \
+                -r ${jh7100_recovery_binary} \
+                -b ${jh7100_secondBoot} \
+                -d ${jh7100_ddrinit}
+            '';
             program = pkgs.writeShellScript "flash-visionfive.sh" ''
-              flash() {
-                (
-                  set -x
-                  ${pkgs.lib.getExe self.packages.${system}.jh7100-recover} \
-                    -D $1 \
-                    -r ${jh7100_recovery_binary} \
-                    -b ${jh7100_secondBoot} \
-                    -d ${jh7100_ddrinit}
-                )
-              }
               if $(groups | grep --quiet --word-regexp "dialout"); then
                 echo "User is in dialout group, flashing to board without sudo"
-                flash
+                ${flashScript} $1
               else
                 echo "User is not in dialout group, flashing to board with sudo"
-                sudo flash
+                sudo ${flashScript} $1
               fi
             '';
           in