summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsijanec <sijanecantonluka@gmail.com>2020-06-09 19:13:54 +0200
committersijanec <sijanecantonluka@gmail.com>2020-06-09 19:13:54 +0200
commit4cb2560ef806194ab31a7bb7deb0d4606b0d89b2 (patch)
treed09edec73d65f81adfdb1139a46713f6c50ebe6a
parenti think merge should work now. see commit details below: (diff)
downloadbeziapp-4cb2560ef806194ab31a7bb7deb0d4606b0d89b2.tar
beziapp-4cb2560ef806194ab31a7bb7deb0d4606b0d89b2.tar.gz
beziapp-4cb2560ef806194ab31a7bb7deb0d4606b0d89b2.tar.bz2
beziapp-4cb2560ef806194ab31a7bb7deb0d4606b0d89b2.tar.lz
beziapp-4cb2560ef806194ab31a7bb7deb0d4606b0d89b2.tar.xz
beziapp-4cb2560ef806194ab31a7bb7deb0d4606b0d89b2.tar.zst
beziapp-4cb2560ef806194ab31a7bb7deb0d4606b0d89b2.zip
-rw-r--r--Makefile2
-rwxr-xr-xconfigure2
-rw-r--r--dist/cache_name.txt2
-rw-r--r--dist/js/app.js2
-rw-r--r--dist/pages/about.html2
-rw-r--r--dist/sw.js4
-rwxr-xr-xinstall2
7 files changed, 8 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 1a32f02..911ebc9 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ default:
@echo "*** BežiApp Makefile ***"
@echo "targets:"
@echo " make prepare installs dependencies, cleans after itself, requires sudo permissions and debian/ubuntu for apt"
- @echo " make install installs BežiApp to dist/"
+ @echo " make generate installs BežiApp to dist/"
@echo "no target specified, exiting ..."
prepare:
diff --git a/configure b/configure
index 6aaed20..7e0ae2c 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
#!/bin/bash
echo " I think that install and configure should be deprecated."
-echo " use sudo make prepare and make install instead and fix any of yours git-pre-add hooks or whatever."
+echo " use sudo make prepare and make generate instead and fix any of yours git-pre-add hooks or whatever."
echo " --sijanec"
mkdir tmp
cd tmp
diff --git a/dist/cache_name.txt b/dist/cache_name.txt
index ec2c7e0..7b41b55 100644
--- a/dist/cache_name.txt
+++ b/dist/cache_name.txt
@@ -2,4 +2,4 @@
-///site-static-1.0.14.3-beta-855d322|||
+///site-static-1.0.14.3-beta-7b41388|||
diff --git a/dist/js/app.js b/dist/js/app.js
index 92f7540..d5eca86 100644
--- a/dist/js/app.js
+++ b/dist/js/app.js
@@ -3,7 +3,7 @@
const app_version = "1.0.14.3-beta";
-const previous_commit = "855d322a78e4575e34500ba0b093f716b8631c30";
+const previous_commit = "7b41388f8eb7be4e8250fe9f69194cf70f1a103b";
const BEZIAPP_UPDATE_INTERVAL = 300; // update vsakih 300 sekund
if ("serviceWorker" in navigator) {
diff --git a/dist/pages/about.html b/dist/pages/about.html
index 9fc3725..0d67d38 100644
--- a/dist/pages/about.html
+++ b/dist/pages/about.html
@@ -160,7 +160,7 @@
<div class="row">
<p>
<small>
- ^HEAD 855d322a78e4575e34500ba0b093f716b8631c30
+ ^HEAD 7b41388f8eb7be4e8250fe9f69194cf70f1a103b
</small>
</p>
</div>
diff --git a/dist/sw.js b/dist/sw.js
index c8c206b..bd4562c 100644
--- a/dist/sw.js
+++ b/dist/sw.js
@@ -3,8 +3,8 @@
// Change version to cause cache refresh
-const static_cache_name = "site-static-1.0.14.3-beta-855d322";
-// commit before the latest is 855d322a78e4575e34500ba0b093f716b8631c30
+const static_cache_name = "site-static-1.0.14.3-beta-7b41388";
+// commit before the latest is 7b41388f8eb7be4e8250fe9f69194cf70f1a103b
// Got them with find . -not -path '*/\.*' | sed "s/.*/\"&\",/" | grep -v sw.js
// sw.js NE SME BITI CACHAN, ker vsebuje verzijo!
diff --git a/install b/install
index 103a454..fe8e47b 100755
--- a/install
+++ b/install
@@ -1,6 +1,6 @@
#!/bin/bash
echo " I think that install and configure should be deprecated."
-echo " use sudo make prepare and make install instead and fix any of yours git-pre-add hooks or whatever."
+echo " use sudo make prepare and make generate instead and fix any of yours git-pre-add hooks or whatever."
echo " --sijanec"
./bin/compose-html assets/pages-src/ dist/pages/ .html
cp -r assets/css dist/