Move scripts for nix
to a different location
This commit is contained in:
parent
d0b055140e
commit
985a408900
3 changed files with 3 additions and 3 deletions
|
@ -78,7 +78,7 @@
|
||||||
diskVar = ''''${${diskVarName}}'';
|
diskVar = ''''${${diskVarName}}'';
|
||||||
|
|
||||||
diskSelector = ''
|
diskSelector = ''
|
||||||
. ${./../../../scripts/Common/Scripts/choose-disk.sh};
|
. ${./choose-disk.sh};
|
||||||
chooseDisk ${diskVarName} "Which disk do you wish to install the OS on?";
|
chooseDisk ${diskVarName} "Which disk do you wish to install the OS on?";
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
@ -176,7 +176,7 @@
|
||||||
else ''
|
else ''
|
||||||
${diskVarName}=${config.devicePath}
|
${diskVarName}=${config.devicePath}
|
||||||
${if osDisk then ''
|
${if osDisk then ''
|
||||||
. ${./../../../scripts/Common/Scripts/is-truthy.sh}
|
. ${./is-truthy.sh}
|
||||||
if [ ! -b ${diskVar} ]; then
|
if [ ! -b ${diskVar} ]; then
|
||||||
function fallback() {
|
function fallback() {
|
||||||
echo "Couldn't find the specified disk \"${diskVar}\"."
|
echo "Couldn't find the specified disk \"${diskVar}\"."
|
||||||
|
@ -357,7 +357,7 @@
|
||||||
] ++
|
] ++
|
||||||
(builtins.map (_: _.deviceScript) disks) ++
|
(builtins.map (_: _.deviceScript) disks) ++
|
||||||
lib.optionals ((builtins.length disks) > 0) [
|
lib.optionals ((builtins.length disks) > 0) [
|
||||||
". ${./../../../scripts/Common/Scripts/is-truthy.sh}"
|
". ${./is-truthy.sh}"
|
||||||
''echo "$(tput setaf 3)==== WARNING ====$(tput sgr0)"''
|
''echo "$(tput setaf 3)==== WARNING ====$(tput sgr0)"''
|
||||||
(''echo "Continuing this script will alter the partitions of '' + (
|
(''echo "Continuing this script will alter the partitions of '' + (
|
||||||
lib.strings.concatStringsSep ", " (builtins.map (_: "${_.deviceVariable}") (lib.lists.init disks))
|
lib.strings.concatStringsSep ", " (builtins.map (_: "${_.deviceVariable}") (lib.lists.init disks))
|
||||||
|
|
Loading…
Reference in a new issue