Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

infest prepare: add _which

Browse Source
This commit is contained in:
jeschli 2018-01-09 22:04:02 +01:00
parent 26c4dfbdfc
commit f4a23ea078
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
krebs/4lib/infest/prepare.sh
View File

@ -94,11 +94,14 @@ prepare_nixos_iso() {
mkdir -p bin mkdir -p bin
rm -f bin/nixos-install rm -f bin/nixos-install
cp "$(type -p nixos-install)" bin/nixos-install cp "$(_which nixos-install)" bin/nixos-install
sed -i "s@NIX_PATH=\"[^\"]*\"@NIX_PATH=$target_path@" bin/nixos-install sed -i "s@NIX_PATH=\"[^\"]*\"@NIX_PATH=$target_path@" bin/nixos-install
} }
prepare_hetzner_rescue() { prepare_hetzner_rescue() {
_which() (
which "$1"
)
mountpoint /mnt mountpoint /mnt
type bzip2 2>/dev/null || apt-get install bzip2 type bzip2 2>/dev/null || apt-get install bzip2
@ -138,6 +141,9 @@ EOF
} }
prepare_common() {( prepare_common() {(
_which() (
type -p "$1"
)
_prepare_nix_users _prepare_nix_users
@ -245,7 +251,7 @@ _prepare_nixos_install() {
mkdir -p bin mkdir -p bin
rm -f bin/nixos-install rm -f bin/nixos-install
cp "$(type -p nixos-install)" bin/nixos-install cp "$(_which nixos-install)" bin/nixos-install
sed -i "s@NIX_PATH=\"[^\"]*\"@NIX_PATH=$target_path@" bin/nixos-install sed -i "s@NIX_PATH=\"[^\"]*\"@NIX_PATH=$target_path@" bin/nixos-install
if ! grep -q '^PATH.*#krebs' .bashrc; then if ! grep -q '^PATH.*#krebs' .bashrc; then