From da3e3e4168be1f03be3753af5c0ef5d6bc846a3d Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Tue, 26 Nov 2013 16:43:06 +0100 Subject: [PATCH] fix quoting in click installer egrep call --- debian/changelog | 6 ++++++ live-build/ubuntu-touch/hooks/60-install-click.chroot | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 7ff25976..fae54d2c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.200) UNRELEASED; urgency=low + + * use proper quoting for egrep call in click installer + + -- Oliver Grawert Tue, 26 Nov 2013 16:41:56 +0100 + livecd-rootfs (2.199) trusty; urgency=low * make the click package installation check for proper architecture before diff --git a/live-build/ubuntu-touch/hooks/60-install-click.chroot b/live-build/ubuntu-touch/hooks/60-install-click.chroot index aa35a915..0b4b2b7d 100755 --- a/live-build/ubuntu-touch/hooks/60-install-click.chroot +++ b/live-build/ubuntu-touch/hooks/60-install-click.chroot @@ -20,7 +20,7 @@ CLICKARCH=$(dpkg --print-architecture) wget --no-verbose -O "$tmpdir/click_list" "$click_list" for package in $(cat "$tmpdir/click_list") do - if echo $package | egrep -q _$CLICKARCH.click|_all.click|_unknown.click; then + if echo $package | egrep -q "_$CLICKARCH.click|_all.click|_unknown.click"; then echo "Setting up $package" wget --no-verbose -O "$tmpdir/$package" "$click_uri/$package" click install --force-missing-framework --root="$click_db" --all-users \