# HG changeset patch # User Pascal Bellard # Date 1571566630 -7200 # Node ID 1547b72da2760c5ed3c389fe1914f4f1704ae4fd # Parent d41f08c53b3ee70b023cf748d9a36eadbb2a2f82 Remove cat process diff -r d41f08c53b3e -r 1547b72da276 tazinst --- a/tazinst Mon Mar 04 14:16:21 2019 -0500 +++ b/tazinst Sun Oct 20 12:17:10 2019 +0200 @@ -1242,8 +1242,8 @@ mount_cdrom() { # set device name - local drive="$(cat /proc/sys/dev/cdrom/info | \ - grep "drive name" | cut -f 3)" + local drive="$(grep "drive name" < \ + /proc/sys/dev/cdrom/info | cut -f 3)" [ -n "$drive" ] || drive=cdrom local cdrom=/dev/$drive # mount cdrom @@ -1277,7 +1277,7 @@ # check integrity local md5file=$(printf "%s" $SOURCE | sed 's/.iso$/.md5/') if [ -r "$md5file" ]; then - local md5ref="$(cat "$md5file" | cut -d' ' -f1)" + local md5ref="$(cut -d' ' -f1 < "$md5file")" local md5calc="$(md5sum $SOURCE | cut -d' ' -f1)" if [ ! "$md5calc" = "$md5ref" ]; then log "md5sum iso=$md5ref md5sum tazinst=$md5calc" @@ -2112,7 +2112,7 @@ log "$(_ 'Checking the availability of packages...')" touch packages-to-install.list packages=0 - diff="$(cat packages-selection.diff | sort)" + diff="$(sort < packages-selection.diff)" for pkg in $diff do if grep -q ^$pkg-[0-9] /var/lib/tazpkg/packages.list; then @@ -2127,7 +2127,7 @@ log "$(_ 'packages to install: 0')" else # get-install all missing pkgs. - for pkg in $(cat packages-to-install.list) + while read pkg do log "$(_ 'Installing: %s...' "$pkg")" # get install package and answer yes in case of dependencies. @@ -2136,7 +2136,7 @@ yes "" | /usr/bin/tazpkg install $pkgname.tazpkg \ --root=$TARGET_ROOT >/dev/null 2>/dev/null rm -f $pkgname.tazpkg - done + done < packages-to-install.list fi log "$(_ 'Installation of packages complete...')" }