From 6df57448ed20b2d506f63578fb1c574b5849c641 Mon Sep 17 00:00:00 2001
From: Neale Pickett <neale@lanl.gov>
Date: Fri, 24 Jul 2020 13:42:28 -0600
Subject: [PATCH] dev server: relative puzzle dirs, default bind 0.0.0.0

---
 devel.sh              | 27 ---------------------------
 devel/devel-server.py |  4 ++--
 devel/moth.py         |  1 -
 3 files changed, 2 insertions(+), 30 deletions(-)
 delete mode 100755 devel.sh

diff --git a/devel.sh b/devel.sh
deleted file mode 100755
index c00b479..0000000
--- a/devel.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-# Script to clone and start a development server
-
-set -e
-
-if [ -f tools/devel-server.py ]; then
-	cat <<EOM
-This script is intended to be used to bootstrap a moth development server. It
-looks like you're running the script from a moth repository working directory.
-
-    $ mkdir /tmp/moth
-    $ cd /tmp/moth
-    $ curl https://raw.githubusercontent.com/dirtbags/moth/master/devel.sh | sh
-EOM
-	exit 1
-fi
-
-[ -d puzzles  ] || mkdir -p puzzles
-[ -d moth/bin ] || git clone https://github.com/dirtbags/moth.git
-
-cd moth
-puzzles="$(readlink -e ../puzzles)"
-ln -sf "${puzzles}" puzzles
-
-printf "\n[+] Place puzzles at ${puzzles} ...\n"
-python3 tools/devel-server.py
diff --git a/devel/devel-server.py b/devel/devel-server.py
index 34e5b42..c58e1b3 100755
--- a/devel/devel-server.py
+++ b/devel/devel-server.py
@@ -262,7 +262,7 @@ if __name__ == '__main__':
         '--theme', default='theme',
         help="Directory containing theme files")
     parser.add_argument(
-        '--bind', default="127.0.0.1:8080",
+        '--bind', default=":8080",
         help="Bind to ip:port"
     )
     parser.add_argument(
@@ -277,7 +277,7 @@ if __name__ == '__main__':
     )
     args = parser.parse_args()
     parts = args.bind.split(":")
-    addr = parts[0] or "0.0.0.0"
+    addr = parts[0]
     port = int(parts[1])
     if args.verbose >= 2:
         log_level = logging.DEBUG
diff --git a/devel/moth.py b/devel/moth.py
index 98d08a6..c84f102 100644
--- a/devel/moth.py
+++ b/devel/moth.py
@@ -497,7 +497,6 @@ class Category:
             with pushd(self.path):
                 self.catmod.make(points, puzzle)
         else:
-            with pushd(self.path):
                 puzzle.read_directory(path)
         return puzzle