diff options
Diffstat (limited to 'bootstrap')
| -rwxr-xr-x | bootstrap/activate/activate.sh | 9 | ||||
| -rw-r--r-- | bootstrap/activate/default.nix | 4 | ||||
| -rwxr-xr-x | bootstrap/config_setup/config_setup.sh | 7 | ||||
| -rw-r--r-- | bootstrap/config_setup/default.nix | 4 | ||||
| -rw-r--r-- | bootstrap/install/default.nix | 4 | ||||
| -rwxr-xr-x | bootstrap/install/install.sh | 4 | ||||
| -rw-r--r-- | bootstrap/setup/default.nix | 4 | ||||
| -rwxr-xr-x | bootstrap/setup/setup.sh | 4 |
8 files changed, 20 insertions, 20 deletions
diff --git a/bootstrap/activate/activate.sh b/bootstrap/activate/activate.sh index f6176e59..d34a2826 100755 --- a/bootstrap/activate/activate.sh +++ b/bootstrap/activate/activate.sh @@ -1,8 +1,8 @@ #! /usr/bin/env dash -# shellcheck disable=SC2086 + # shellcheck source=/dev/null -. %SHELL_LIBRARY_PATH -export LIB_TEMP_DIR_FOR_SCRIPT="$(mktemp -d)" +SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH + mne() { mount --mkdir --options compress-force=zstd:15,subvol="$1" $DISK_ROOT "$2" || dien "Mounting of $1"; } @@ -71,4 +71,5 @@ case $result in exit 1 ;; esac -if [ -d "$LIB_TEMP_DIR_FOR_SCRIPT" ];then rm -r "$LIB_TEMP_DIR_FOR_SCRIPT"; fi + +# vim: ft=sh diff --git a/bootstrap/activate/default.nix b/bootstrap/activate/default.nix index c60d8e73..abada12c 100644 --- a/bootstrap/activate/default.nix +++ b/bootstrap/activate/default.nix @@ -6,6 +6,6 @@ }: let dependencies = builtins.attrValues {inherit (pkgs) jq gawk curl coreutils libuuid nix git;}; name = "activate"; - script = ./activate.sh; + src = ./activate.sh; in - sysLib.makeShellScriptWithLibrary {inherit dependencies name script;} + sysLib.writeShellScriptWithLibrary {inherit dependencies name src;} diff --git a/bootstrap/config_setup/config_setup.sh b/bootstrap/config_setup/config_setup.sh index c856c517..15b41a8d 100755 --- a/bootstrap/config_setup/config_setup.sh +++ b/bootstrap/config_setup/config_setup.sh @@ -1,8 +1,7 @@ #! /usr/bin/env dash -# shellcheck disable=SC2086 + # shellcheck source=/dev/null -. %SHELL_LIBRARY_PATH -export LIB_TEMP_DIR_FOR_SCRIPT="$(mktemp -d)" +SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH # clone packer.nvim to the needed dir, for the nvim install to work @@ -10,4 +9,4 @@ git clone --depth 1 https://github.com/wbthomason/packer.nvim /mnt/srv/home/sois nvim -c 'PackerSync' -c 'qall' -u '/mnt/srv/home/soispha/.config/nvim/init.lua' --headless -if [ -d "$LIB_TEMP_DIR_FOR_SCRIPT" ];then rm -r "$LIB_TEMP_DIR_FOR_SCRIPT"; fi +# vim: ft=sh diff --git a/bootstrap/config_setup/default.nix b/bootstrap/config_setup/default.nix index 20de9542..4cae8424 100644 --- a/bootstrap/config_setup/default.nix +++ b/bootstrap/config_setup/default.nix @@ -6,6 +6,6 @@ }: let dependencies = builtins.attrValues {inherit (pkgs) git neovim;}; name = "config_setup"; - script = ./config_setup.sh; + src = ./config_setup.sh; in - sysLib.makeShellScriptWithLibrary {inherit dependencies name script;} + sysLib.writeShellScriptWithLibrary {inherit dependencies name src;} diff --git a/bootstrap/install/default.nix b/bootstrap/install/default.nix index 054c28ec..4f520c92 100644 --- a/bootstrap/install/default.nix +++ b/bootstrap/install/default.nix @@ -6,6 +6,6 @@ }: let dependencies = builtins.attrValues {inherit (pkgs) jq dash curl gawk btrfs-progs coreutils libuuid gptfdisk dosfstools toybox nix git;}; name = "install"; - script = ./install.sh; + src = ./install.sh; in - sysLib.makeShellScriptWithLibrary {inherit dependencies name script;} + sysLib.writeShellScriptWithLibrary {inherit dependencies name src;} diff --git a/bootstrap/install/install.sh b/bootstrap/install/install.sh index 8417448e..5e8c4eca 100755 --- a/bootstrap/install/install.sh +++ b/bootstrap/install/install.sh @@ -1,7 +1,7 @@ #! /usr/bin/env dash -# shellcheck disable=SC2086 + # shellcheck source=/dev/null -. %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH bsc() { msg2 "$(btrfs subvolume create "$1" || die "Creating of subvol $1 failed")"; } diff --git a/bootstrap/setup/default.nix b/bootstrap/setup/default.nix index b32a822b..905ddd1b 100644 --- a/bootstrap/setup/default.nix +++ b/bootstrap/setup/default.nix @@ -6,6 +6,6 @@ }: let dependencies = builtins.attrValues {inherit (pkgs) dash gawk curl git nix gnugrep nixos-install-tools coreutils libuuid;}; name = "setup"; - script = ./setup.sh; + src = ./setup.sh; in - sysLib.makeShellScriptWithLibrary {inherit dependencies name script;} + sysLib.writeShellScriptWithLibrary {inherit dependencies name src;} diff --git a/bootstrap/setup/setup.sh b/bootstrap/setup/setup.sh index d66f4739..803123e3 100755 --- a/bootstrap/setup/setup.sh +++ b/bootstrap/setup/setup.sh @@ -1,7 +1,7 @@ #! /usr/bin/env dash -# shellcheck disable=SC2086 + # shellcheck source=/dev/null -. %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH msg "Select a host-config:" hosts=$(mktmp); host=""; |