diff options
| author | Will Dietz <w@wdtz.org> | 2020-01-26 16:42:21 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-26 16:42:21 -0600 |
| commit | b856b24bfaf44dd7c101d1afbefec850e968365a (patch) | |
| tree | e08f288063c2c43737e4ac3eb05ca5be533f8300 /pkgs/os-specific/linux/kernel | |
| parent | 05d201560b7d6b2c3c514fd60af527f987d17d97 (diff) | |
| parent | 84a6071bc7df74eddbf2e1c18cde567885fc1328 (diff) | |
Merge pull request #77490 from dtzWill/fix/kernel-update-sed-e
kernel/update.sh: always use -e
Diffstat (limited to 'pkgs/os-specific/linux/kernel')
| -rwxr-xr-x | pkgs/os-specific/linux/kernel/update.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/kernel/update.sh b/pkgs/os-specific/linux/kernel/update.sh index dbfa052d292f5..c7fcc07ea0a8b 100755 --- a/pkgs/os-specific/linux/kernel/update.sh +++ b/pkgs/os-specific/linux/kernel/update.sh @@ -15,7 +15,7 @@ fi # Inspect each file and see if it has the latest version NIXPKGS="$(git rev-parse --show-toplevel)" ls $NIXPKGS/pkgs/os-specific/linux/kernel | while read FILE; do - KERNEL="$(sed -n $LINUXSED <<< "$FILE")" + KERNEL="$(sed -n -e $LINUXSED <<< "$FILE")" [ -z "$KERNEL" ] && continue # Find the matching new kernel version @@ -45,11 +45,11 @@ ls $NIXPKGS/pkgs/os-specific/linux/kernel | while read FILE; do echo "Failed to get hash of $URL" continue fi - sed -i "s/sha256 = \".*\"/sha256 = \"$HASH\"/g" $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE + sed -i -e "s/sha256 = \".*\"/sha256 = \"$HASH\"/g" $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE # Rewrite the expression sed -i -e '/version = /d' $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE - sed -i "\#buildLinux (args // rec {#a \ version = \"$V\";" $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE + sed -i -e "\#buildLinux (args // rec {#a \ version = \"$V\";" $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE # Commit the changes git add -u $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE |