From 94febe86cd81f2d40d4e5f93f7dfb9be82dbff15 Mon Sep 17 00:00:00 2001 From: marudor Date: Sat, 11 May 2019 12:51:41 +0200 Subject: Release version 19, fix asset-release for macos --- public/service-worker.js | 24 ++++++++++++------------ public/static/css/material-icons.css | 8 ++++---- public/static/manifest.json | 12 ++++++------ public/static/v17 | 1 - public/static/v19 | 1 + scripts/asset-release | 8 ++++---- templates/layouts/default.html.ep | 2 +- 7 files changed, 28 insertions(+), 28 deletions(-) delete mode 120000 public/static/v17 create mode 120000 public/static/v19 diff --git a/public/service-worker.js b/public/service-worker.js index e5cbf68..4f92662 100644 --- a/public/service-worker.js +++ b/public/service-worker.js @@ -1,18 +1,18 @@ -const CACHE_NAME = 'static-cache-v18'; +const CACHE_NAME = 'static-cache-v19'; const FILES_TO_CACHE = [ '/favicon.ico', '/offline.html', - '/static/v18/css/materialize.min.css', - '/static/v18/css/material-icons.css', - '/static/v18/css/local.css', - '/static/v18/fonts/MaterialIcons-Regular.woff2', - '/static/v18/fonts/MaterialIcons-Regular.woff', - '/static/v18/fonts/MaterialIcons-Regular.ttf', - '/static/v18/js/jquery-3.4.1.min.js', - '/static/v18/js/materialize.min.js', - '/static/v18/js/travelynx-actions.min.js', - '/static/v18/js/autocomplete.min.js', - '/static/v18/js/geolocation.min.js', + '/static/v19/css/materialize.min.css', + '/static/v19/css/material-icons.css', + '/static/v19/css/local.css', + '/static/v19/fonts/MaterialIcons-Regular.woff2', + '/static/v19/fonts/MaterialIcons-Regular.woff', + '/static/v19/fonts/MaterialIcons-Regular.ttf', + '/static/v19/js/jquery-3.4.1.min.js', + '/static/v19/js/materialize.min.js', + '/static/v19/js/travelynx-actions.min.js', + '/static/v19/js/autocomplete.min.js', + '/static/v19/js/geolocation.min.js', ]; self.addEventListener('install', (evt) => { diff --git a/public/static/css/material-icons.css b/public/static/css/material-icons.css index e2de606..36185f0 100644 --- a/public/static/css/material-icons.css +++ b/public/static/css/material-icons.css @@ -2,12 +2,12 @@ font-family: 'Material Icons'; font-style: normal; font-weight: 400; - src: url(/static/v18/fonts/MaterialIcons-Regular.eot); /* For IE6-8 */ + src: url(/static/v19/fonts/MaterialIcons-Regular.eot); /* For IE6-8 */ src: local('Material Icons'), local('MaterialIcons-Regular'), - url(/static/v18/fonts/MaterialIcons-Regular.woff2) format('woff2'), - url(/static/v18/fonts/MaterialIcons-Regular.woff) format('woff'), - url(/static/v18/fonts/MaterialIcons-Regular.ttf) format('truetype'); + url(/static/v19/fonts/MaterialIcons-Regular.woff2) format('woff2'), + url(/static/v19/fonts/MaterialIcons-Regular.woff) format('woff'), + url(/static/v19/fonts/MaterialIcons-Regular.ttf) format('truetype'); } .material-icons { diff --git a/public/static/manifest.json b/public/static/manifest.json index 9fcb00e..30116d5 100644 --- a/public/static/manifest.json +++ b/public/static/manifest.json @@ -3,27 +3,27 @@ "short_name": "Travelynx", "scope": "/", "icons": [{ - "src": "/static/v18/icons/icon-128x128.png", + "src": "/static/v19/icons/icon-128x128.png", "sizes": "128x128", "type": "image/png" }, { - "src": "/static/v18/icons/icon-144x144.png", + "src": "/static/v19/icons/icon-144x144.png", "sizes": "144x144", "type": "image/png" }, { - "src": "/static/v18/icons/icon-152x152.png", + "src": "/static/v19/icons/icon-152x152.png", "sizes": "152x152", "type": "image/png" }, { - "src": "/static/v18/icons/icon-192x192.png", + "src": "/static/v19/icons/icon-192x192.png", "sizes": "192x192", "type": "image/png" }, { - "src": "/static/v18/icons/icon-256x256.png", + "src": "/static/v19/icons/icon-256x256.png", "sizes": "256x256", "type": "image/png" }, { - "src": "/static/v18/icons/icon-512x512.png", + "src": "/static/v19/icons/icon-512x512.png", "sizes": "512x512", "type": "image/png" }], diff --git a/public/static/v17 b/public/static/v17 deleted file mode 120000 index 945c9b4..0000000 --- a/public/static/v17 +++ /dev/null @@ -1 +0,0 @@ -. \ No newline at end of file diff --git a/public/static/v19 b/public/static/v19 new file mode 120000 index 0000000..945c9b4 --- /dev/null +++ b/public/static/v19 @@ -0,0 +1 @@ +. \ No newline at end of file diff --git a/scripts/asset-release b/scripts/asset-release index 5a65bca..20d08e7 100755 --- a/scripts/asset-release +++ b/scripts/asset-release @@ -2,16 +2,16 @@ set -ex -current="$(ls -d public/static/v* | tail -n 1 | grep -o '..$')" +current="$(find -d public/static/v* | tail -n 1 | grep -o '..$')" prev=$((current - 1)) next=$((current + 1)) git mv public/static/v${prev} public/static/v${next} -sed -i "s!/v${current}/!/v${next}/!g" \ +perl -pi -e "s!/v${current}/!/v${next}/!g" \ public/service-worker.js public/static/manifest.json \ public/static/css/material-icons.css -sed -i "s!static-cache-v${current}!static-cache-v${next}!" public/service-worker.js +perl -pi -e "s!static-cache-v${current}!static-cache-v${next}!" public/service-worker.js -sed -i "s!av = 'v${current}'!av = 'v${next}'!" templates/layouts/default.html.ep +perl -pi -e "s!av = 'v${current}'!av = 'v${next}'!" templates/layouts/default.html.ep diff --git a/templates/layouts/default.html.ep b/templates/layouts/default.html.ep index fa793c2..fe7a088 100644 --- a/templates/layouts/default.html.ep +++ b/templates/layouts/default.html.ep @@ -9,7 +9,7 @@ - % my $av = 'v18'; # asset version + % my $av = 'v19'; # asset version -- cgit v1.2.3