Tidy up repo and build script

Author: deanishe

.gitignore

@@ -1,8 +1,8 @@
 # Keep the generated binary out of the repo
 /alfssh
 /build
-# And the file for generating data
-/demo-data.py
+/dist
+
 
 # Created by https://www.gitignore.io/api/vim,go
 

build-workflow.zsh renamed to bin/build-workflow.zsh

@@ -1,10 +1,11 @@
 #!/usr/bin/env zsh
 
-wffiles=(alfssh icon.png update.png info.plist README.md LICENCE.txt)
+wffiles=(alfssh info.plist README.md LICENCE.txt)
 # Icons
-icons=(icons/icon.iconset icons/update.iconset)
+icons=(icon.png update.png)
+wffiles+=($icons)
 
-here="$( cd "$( dirname "$0" )"; pwd )"
+workdir="$( cd "$( dirname "$0" )"/../; pwd )"
 delbuild=1
 
 log() {
@@ -25,7 +26,7 @@ Usage:
     build-workflow.zsh -h
 
 Options:
-    -c      Clean the build directory
+    -c      Clean the dist directory
     -d      Also build distributable .alfredworkflow file
     -h      Show this help message and exit
 EOS
@@ -52,12 +53,12 @@ done
 shift $((OPTIND-1))
 
 cleanup() {
-    local p="${here}/build"
+    local p="${workdir}/dist"
     log "Cleaning up ..."
-    test -d "$p" && rm -rf ./build/
+    test -d "$p" && rm -rf ./dist/
 }
 
-pushd "$here" &> /dev/null
+pushd "$workdir" &>/dev/null
 
 log "Building executable(s) ..."
 go build -v -o ./alfssh ./cmd/alfssh
@@ -74,22 +75,22 @@ chmod 755 ./alfssh
 
 log
 
-log "Cleaning ./build ..."
-rm -rvf ./build
+log "Cleaning ./dist ..."
+rm -rvf ./dist
 
 log
 
-log "Copying assets to ./build ..."
+log "Copying icons to root ..."
 
 for f in $icons; do
     n="${f:t:r}"
-    cp -v "${f}/icon_128x128.png" "./${n}.png"
+    cp -v "icons/${f}" "./${n}.png"
 done
 
-mkdir -vp ./build
+mkdir -vp ./dist
 
 for n in $wffiles; do
-    cp -v "$n" ./build/
+    cp -v "$n" ./dist/
 done
 
 
@@ -112,7 +113,7 @@ if [[ $do_dist -eq 1 ]]; then
         log
     fi
 
-    pushd ./build/ &> /dev/null
+    pushd ./dist/ &>/dev/null
 
     log "Cleaning info.plist ..."
     /usr/libexec/PlistBuddy -c 'Delete :variables:DEMO_MODE' info.plist
@@ -127,7 +128,7 @@ if [[ $do_dist -eq 1 ]]; then
         popd &> /dev/null
         exit $ST_ZIP
     fi
-    popd &> /dev/null
+    popd &>/dev/null
 
     log
     log "Wrote '${zipfile}' in '$( pwd )'"
@@ -136,4 +137,4 @@ fi
 [[ $do_clean -eq 1 ]] && cleanup
 
 
-popd &> /dev/null
+popd &>/dev/null

bin/demo-data.py

@@ -0,0 +1,107 @@
+#!/usr/bin/env python
+# encoding: utf-8
+#
+# Copyright (c) 2016 Dean Jackson <deanishe@deanishe.net>
+#
+# MIT Licence. See http://opensource.org/licenses/MIT
+#
+# Created on 2016-05-26
+#
+
+"""Generate some random host."""
+
+from __future__ import print_function, unicode_literals, absolute_import
+
+from random import choice, randint, shuffle
+
+COUNT = 30
+
+domains = """\
+bartell.com
+fay-king.com
+gierschner.org
+johann.com
+junitz.com
+kassulke-spencer.com
+kessler.com
+kostolzin.de
+kuhlman-wolf.info
+kulas-douglas.biz
+larson-schumm.info
+lind-sipes.com
+lockman.com
+losekann.com
+maelzer.org
+mayer.biz
+reinger.info
+roemer.com
+scholz.net
+sipes.com
+trapp.com
+wesack.com
+zorbach.com
+""".strip().split('\n')
+
+subdomains = """\
+mail
+www
+vpn
+ftp
+gateway
+""".strip().split('\n')
+
+servers = """\
+antonetta
+balduin
+elias
+ermanno
+ethelyn
+fechner
+froehlich
+gene
+heinz
+heser
+holsten
+hornich
+iliana
+kadeem
+kurt
+leslee
+meyer
+moesha
+monja
+reiner
+roland
+russel
+rust
+sandy
+teobaldo
+valerius
+wulff
+zaida
+""".strip().split('\n')
+
+
+def domain(host):
+    """Return domain of `host`."""
+    return host.split('.', 1)[1]
+
+
+def main():
+    """Run script."""
+    shuffle(servers)
+
+    hosts = []
+    for i in range(COUNT):
+        d = choice(domains)
+        if randint(0, 1):
+            s = servers.pop()
+        else:
+            s = choice(subdomains)
+        hosts.append('{}.{}'.format(s, d))
+
+    for h in sorted(hosts, key=domain):
+        print('"{}",'.format(h))
+
+if __name__ == '__main__':
+    main()

icon.png

@@ -1,12 +1,12 @@
 
-**/*.go info.plist build-workflow.zsh icons/*.icns {
+**/*.go info.plist bin/build-workflow.zsh icons/*iconset/*.png {
     # prep: echo @mods
     # prep: go build -v gogs.deanishe.net/deanishe/awgo
-    prep: go test -v && ./build-workflow.zsh
+    prep: go test -v && bin/build-workflow.zsh
     # prep: ./alfssh search toot > /dev/null
 }
 
 /Users/daj/src/gogs.deanishe.net/deanishe/awgo/**.go {
-	prep: ./build-workflow.zsh
+	prep: bin/build-workflow.zsh
     prep: ./alfssh search toot > /dev/null
 }