Repository: cloudstack Updated Branches: refs/heads/master 20d3cf1ac -> 7072d8d70
CLOUDSTACK-7654 fixed issues with zip format templates. (cherry picked from commit 67ff7dac8290560715629241e09fe9fb0359c990) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/42fd2d91 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/42fd2d91 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/42fd2d91 Branch: refs/heads/master Commit: 42fd2d91da1e5c099fcb68ad2b6699fd77ca53b4 Parents: 0df4319 Author: Rajesh Battala <rajesh.batt...@citrix.com> Authored: Tue Oct 7 12:38:43 2014 +0530 Committer: David Nalley <da...@gnsa.us> Committed: Mon Oct 13 00:30:23 2014 -0400 ---------------------------------------------------------------------- scripts/installer/createtmplt.sh | 2 +- scripts/storage/qcow2/createtmplt.sh | 2 +- scripts/storage/secondary/createtmplt.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/42fd2d91/scripts/installer/createtmplt.sh ---------------------------------------------------------------------- diff --git a/scripts/installer/createtmplt.sh b/scripts/installer/createtmplt.sh index bd539dd..95ecd9c 100755 --- a/scripts/installer/createtmplt.sh +++ b/scripts/installer/createtmplt.sh @@ -74,7 +74,7 @@ uncompress() { ;; bzip2) bunzip2 -c $1 > $tmpfile ;; - ZIP) unzip -p $1 | cat > $tmpfile + [zZ][iI][pP]) unzip -p $1 | cat > $tmpfile ;; *) printf "$1" return 0 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/42fd2d91/scripts/storage/qcow2/createtmplt.sh ---------------------------------------------------------------------- diff --git a/scripts/storage/qcow2/createtmplt.sh b/scripts/storage/qcow2/createtmplt.sh index 8d6dd0d..38bb561 100755 --- a/scripts/storage/qcow2/createtmplt.sh +++ b/scripts/storage/qcow2/createtmplt.sh @@ -74,7 +74,7 @@ uncompress() { ;; bzip2) bunzip2 -c $1 > $tmpfile ;; - ZIP) unzip -p $1 | cat > $tmpfile + [zZ][iI][pP]) unzip -p $1 | cat > $tmpfile ;; *) printf "$1" return 0 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/42fd2d91/scripts/storage/secondary/createtmplt.sh ---------------------------------------------------------------------- diff --git a/scripts/storage/secondary/createtmplt.sh b/scripts/storage/secondary/createtmplt.sh index 6b31232..358022b 100755 --- a/scripts/storage/secondary/createtmplt.sh +++ b/scripts/storage/secondary/createtmplt.sh @@ -73,7 +73,7 @@ is_compressed() { ;; bzip2) ctype="bz2" ;; - ZIP) ctype="zip" + [zZ][iI][pP]) ctype="zip" ;; *) echo "File $1 does not appear to be compressed" >&2 return 1 @@ -92,7 +92,7 @@ uncompress() { ;; bzip2) bunzip2 -q -c $1 > $tmpfile ;; - ZIP) unzip -q -p $1 | cat > $tmpfile + [zZ][iI][pP]) unzip -q -p $1 | cat > $tmpfile ;; *) printf "$1" return 0
