rarias/nixos-riscv
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

flashOriginal: use shell script instead of bash function

Browse Source
This commit is contained in:
matthewcroughan 2022-07-11 18:39:36 +01:00
parent ee7641c770
commit 7f60d1bdb2
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
flake.nix
View File

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