merge js files

.drone.script

@@ -17,7 +17,14 @@ def minify_pack():
           'mkdir static.min/js',
           'minify -o static.min/css/min.css static/css/main.css static/css/all.min.css',
           'minify -o static.min/index.html static/index.html',
-          'minify -o static.min/js/min.js static/js/jquery-3.4.1.min.js static/js/fuzzysort.js static/js/pdf.js static/js/pdf.worker.js static/js/main.js',
+          # 'minify -o static.min/js/jquery-3.4.1.min.js static/js/jquery-3.4.1.min.js',
+          # 'minify -o static.min/js/pdf.min.js static/js/pdf.js',
+          # 'minify -o static.min/js/pdf-worker.min.js static/js/pdf-worker.js',
+          # 'minify -o static.min/js/fuzzysort.min.js static/js/fuzzysort.js',
+          # 'minify -o static.min/js/main.min.js static/js/main.js',
+          'minify -o static.min/js/jquery-3.4.1.min.js static/js/jquery-3.4.1.min.js',
+          'minify -o static.min/js/pdf.min.js static/js/pdf.js static/js/pdf.worker.js',
+          'minify -o static.min/js/main.min.js static/js/fuzzysort.js static/js/main.js',
           'cp static/fonts/* static.min/fonts/',
           '/go/bin/packr2',
       ]

.drone.yml

@@ -18,7 +18,9 @@ steps:
   - mkdir static.min/js
   - minify -o static.min/css/min.css static/css/main.css static/css/all.min.css
   - minify -o static.min/index.html static/index.html
-  - minify -o static.min/js/min.js static/js/jquery-3.4.1.min.js static/js/fuzzysort.js static/js/pdf.js static/js/pdf.worker.js static/js/main.js
+  - minify -o static.min/js/jquery-3.4.1.min.js static/js/jquery-3.4.1.min.js
+  - minify -o static.min/js/pdf.min.js static/js/pdf.js static/js/pdf.worker.js
+  - minify -o static.min/js/main.min.js static/js/fuzzysort.js static/js/main.js
   - "cp static/fonts/* static.min/fonts/"
   - /go/bin/packr2
 
@@ -89,6 +91,6 @@ steps:
 
 ---
 kind: signature
-hmac: af20957923d1dc19caa79fe21ab8504c8834c73799da7fc0216028f6c6506206
+hmac: 8d9c8bb60b4378635410c56e6afb335f7ca2ec80c2e57be63c9d840fc2db7e36
 
 ...

main.go

@@ -60,6 +60,15 @@ func main() {
 	sheetDir := SheetDir{Compress: *compress, Dir: *sheet_dir}
 	FileServer(r, "/", box)
 	FileServer(r, "/sheets", sheetDir)
-	http.ListenAndServe(fmt.Sprintf(":%v", *port), r)
+
+	addr := fmt.Sprintf(":%v", *port)
+
+	fmt.Println("Digital Music Stand (https://github.com/PatWie/digitalmusicstand)",
+		"listens and serves at ", addr)
+
+	err = http.ListenAndServe(addr, r)
+	if err != nil {
+		log.Fatal(err)
+	}
 
 }

release.sh

@@ -0,0 +1,17 @@
+rm -rf static.min
+mkdir static.min
+mkdir static.min/fonts
+mkdir static.min/css
+mkdir static.min/js
+minify -o static.min/css/min.css static/css/main.css static/css/all.min.css
+minify -o static.min/index.html static/index.html
+minify -o static.min/js/jquery-3.4.1.min.js static/js/jquery-3.4.1.min.js
+minify -o static.min/js/pdf.min.js static/js/pdf.js static/js/pdf.worker.js
+# minify -o static.min/js/pdf.min.js static/js/pdf.js
+# minify -o static.min/js/pdf.worker.min.js static/js/pdf.worker.js
+# minify -o static.min/js/fuzzysort.min.js static/js/fuzzysort.js
+# minify -o static.min/js/main.min.js static/js/main.js
+minify -o static.min/js/main.min.js static/js/fuzzysort.js static/js/main.js
+cp static/fonts/* static.min/fonts/
+~/go/bin/packr2
+go build

static/index.html

@@ -3,15 +3,10 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <title>Digital Music Stand</title>
-    <!-- <link href="/css/main.css" rel="stylesheet">
-    <link href="/css/all.min.css" rel="stylesheet"> -->
     <link href="/css/min.css" rel="stylesheet">
-    <!-- <script type="text/javascript" src="/js/jquery-3.4.1.min.js"></script>
-    <script type="text/javascript" src="/js/fuzzysort.js"></script>
-    <script type="text/javascript" src="/js/pdf.js"></script>
-    <script type="text/javascript" src="/js/pdf.worker.js"></script>
-    <script type="text/javascript" src="/js/main.js"></script> -->
-    <script type="text/javascript" src="/js/min.js"></script>
+    <script type="text/javascript" src="/js/jquery-3.4.1.min.js"></script>
+    <script type="text/javascript" src="/js/pdf.min.js"></script>
+    <script type="text/javascript" src="/js/main.min.js"></script>
   </head>
   <body>
     <div id='prompt'>