Merge pull request #95 from cloudbuilders/simplify

simplify uec image url parsing
This commit is contained in:
sleepsonthefloor 2011-10-24 23:52:12 -07:00
commit efb88d6956

View file

@ -740,8 +740,8 @@ if [[ "$ENABLED_SERVICES" =~ "g-reg" ]]; then
for image_url in ${IMAGE_URLS//,/ }; do for image_url in ${IMAGE_URLS//,/ }; do
# Downloads the image (uec ami+aki style), then extracts it. # Downloads the image (uec ami+aki style), then extracts it.
IMAGE_FNAME=`echo "$image_url" | python -c "import sys; print sys.stdin.read().split('/')[-1]"` IMAGE_FNAME=`basename "$image_url"`
IMAGE_NAME=`echo "$IMAGE_FNAME" | python -c "import sys; print sys.stdin.read().split('.tar.gz')[0].split('.tgz')[0]"` IMAGE_NAME=`basename -s .tar.gz "$IMAGE_FNAME"`
if [ ! -f $FILES/$IMAGE_FNAME ]; then if [ ! -f $FILES/$IMAGE_FNAME ]; then
wget -c $image_url -O $FILES/$IMAGE_FNAME wget -c $image_url -O $FILES/$IMAGE_FNAME
fi fi