X-Git-Url: https://ruderich.org/simon/gitweb/?p=config%2Fdotfiles.git;a=blobdiff_plain;f=shell%2Fsetup.sh;fp=shell%2Fsetup.sh;h=084193e467a0f6757f0183eed056136c2bb6c768;hp=9f622f71494031bd86fb8c2de4a9f8a6a1ce8a76;hb=246cb5f430f8846edefc28783cfa4197bd9034c2;hpb=c99ee2aab00f6e09c5ea4d887ac6722894d6dc37

diff --git a/shell/setup.sh b/shell/setup.sh
index 9f622f7..084193e 100755
--- a/shell/setup.sh
+++ b/shell/setup.sh
@@ -127,6 +127,11 @@ else
     sed_i '/^alias grep=/ s/^/#/' shell/aliases
 fi
 
+if ! lsblk --merge >/dev/null 2>&1; then
+    echo 'shell/aliases: removing lsblk --merge'
+    sed_i 's/lsblk --merge/lsblk/' shell/aliases
+fi
+
 generate screenrc .in cat
 # As screen-256color is not widely supported use it only on machines where the
 # matching terminfo entry is available. This also requires a terminal emulator