Commit 7c700ca8 authored by Andrea Sciaba's avatar Andrea Sciaba
Browse files

Merge branch 'patch-1' into 'master'

replace missed jq-s with same grep as previous substitution

See merge request !19
parents d78ef829 af31f42b
......@@ -228,10 +228,10 @@ if [ $rc == 0 ] ; then
FileInfoTmp=`mktemp /tmp/TFC-from-CVS-Markup.xml.XXX`
echo "Fetch GIT Markup copy of TFC from $cvsMarkupUrl"
./fetch-from-web-gitlab \"$FileInfoUrl\" $FileInfoTmp
last_commit=`jq -r .last_commit_id $FileInfoTmp`
last_commit=$(grep -Po '"last_commit_id":.*?[^\\]",' ${FileInfoTmp} | perl -pe 's/"last_commit_id"://; s/^"//; s/",$//')
CommitInfoUrl="https://gitlab.cern.ch/api/v4/projects/siteconf%2F${SiteName}/repository/commits/${last_commit}"
./fetch-from-web-gitlab \"$CommitInfoUrl\" $FileInfoTmp
FileDate=`jq -r .authored_date $FileInfoTmp`
FileDate=$(grep -Po '"authored_date":.*?[^\\]",' ${FileInfoTmp} | perl -pe 's/"authored_date"://; s/^"//; s/",$//')
let seconds=`date +%s`-`date +%s -d "$FileDate"`
let cvsFileAgeInHours=$seconds/3600
echo "GITTFCAge: ${cvsFileAgeInHours} hours"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment