From fdf353f8754fbed9d2797e1e16f90447d4a572e2 Mon Sep 17 00:00:00 2001 From: Luciano Silva Date: Fri, 17 Feb 2017 20:39:08 -0500 Subject: [PATCH] Fix version number format issue --- assets/common.sh | 16 +++++++++------- pipeline.yml | 5 +++-- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/assets/common.sh b/assets/common.sh index 2c48709..63b1a75 100755 --- a/assets/common.sh +++ b/assets/common.sh @@ -21,14 +21,16 @@ check_version() { local httpHeader=$(curl -R -I $1 2>&1 | grep 'Last-Modified:') # Checks if field "Last-Modified" exists in HTTP header and transform it into timestamp string # if that field is not present, return current timestamp - if [ -z "$httpHeader" ] + local dateVersionFormat="%Y%m%d%H%S" + local dateString=$(date +"$dateVersionFormat") + + if [ ! -z "$httpHeader" ] then - # echo "Last-Modified information not returned for targeted file. Using current date's timestamp as version number." - local dateString=$(date) - else - # echo "$httpHeader" - local dateString=$(echo "$httpHeader" | sed -e "s/Last-Modified: //" | cut -d',' -f 2) + # echo "Last-Modified information returned for targeted file. Extract date, removing day of the week string + local tmpDateString=$(echo "$httpHeader" | sed -e "s/Last-Modified: //" | cut -d',' -f 2) + # rfc1123Format="%d\ %b\ %Y\ %H:%M:%S\ GMT" - in order to work in boot2docker, it has to be outside of quotes in the command below + local dateString=$(date +"$dateVersionFormat" -D %d\ %b\ %Y\ %H:%M:%S\ GMT -d "$tmpDateString") fi - date +"%Y%m%d%H%S" -d "$dateString" + echo "$dateString" } diff --git a/pipeline.yml b/pipeline.yml index 69191cb..9de938c 100644 --- a/pipeline.yml +++ b/pipeline.yml @@ -7,13 +7,14 @@ resource_types: resources: - name: single-file type: curl - check_every: 1m source: url: https://s3-us-west-1.amazonaws.com/lsilva-bpws/PCF_usage/pcf-sandbox-usage-from-2016-09-01-to-2016-09-30_1475771124.json filename: pcf-sandbox.json + jobs: - name: run-and-get-file plan: + - get: single-file - task: run-and-get-file config: platform: linux @@ -23,7 +24,7 @@ jobs: repository: ubuntu tag: "latest" inputs: - - single-file + - name: single-file run: path: sh args: