merge dist/pack and dist/release

4 files changed, 41 insertions, 53 deletions

diff --git a/bin/alv-copilot b/bin/alv-copilot
index 9341655..9a0cf40 100755
--- a/bin/alv-copilot
+++ b/bin/alv-copilot
@@ -7,17 +7,15 @@ trap 'rm -rf "$tmpdir"' EXIT INT TERM HUP
 ARGS=$*
 FIFO=$tmpdir/fifo
 CONF=$tmpdir/conf
-LIBDIR=$(dirname "$0")
-LUA_PATH="$LIBDIR/?.lua;$LIBDIR/?/init.lua;$LUA_PATH"
 
 cat > "$CONF" << 'EOF'
 split
 focus
 screen -t evaltime sh -c 'tty > "$FIFO"; read done < "$FIFO"'
 focus
-screen -t runtime sh -c 'read tty < "$FIFO";  moon "$LIBDIR/alv/copilot.moon" $ARGS 2> "$tty";  echo "[press enter to exit]"; read prompt;  echo done > "$FIFO"'
+screen -t runtime sh -c 'read tty < "$FIFO";  "alv" $ARGS 2> "$tty";  echo "[press enter to exit]"; read prompt;  echo done > "$FIFO"'
 EOF
 
 mkfifo "$FIFO"
-export FIFO ARGS LIBDIR LUA_PATH
+export FIFO ARGS
 exec screen -mc "$CONF"
diff --git a/dist/pack.sh b/dist/pack.sh
deleted file mode 100755
index 81a873e..0000000
--- a/dist/pack.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-set -e
-
-TAG="$1"
-REVISION="${2:-1}"
-
-VERSION="${TAG#v}"
-VERSION=$(echo "$VERSION" | tr -d -)
-ROCKVER="$VERSION-$REVISION"
-
-luarocks build "dist/rocks/alive-$ROCKVER.rockspec" \
-  --pack-binary-rock \
-  --sign \
-  --pin
-mv "alive-$ROCKVER.all.rock" "alive-$ROCKVER.all.rock.asc" dist/rocks
-
-dist/pack-win.sh "$TAG" "$ROCKVER"
diff --git a/dist/release.sh b/dist/release.sh
index 5fa2c5a..6d23584 100755
--- a/dist/release.sh
+++ b/dist/release.sh
@@ -4,9 +4,9 @@ set -e
 TAG="${1:-scm}"
 REVISION="${2:-1}"
 
-if [ "$VERSION" = scm ]; then
-  WHERE=
-  TAG=
+if [ "$TAG" = scm ]; then
+  WHERE=""
+  TAG=""
   VERSION="scm"
 else
   VERSION="${TAG#v}"
@@ -42,10 +42,10 @@ EOF
 fi
 
 list_modules() {
-  find "$1" -type f -name '*.moon' -exec sh -c '
-      MODULE=$(echo "$1" | sed -e "s/\.moon$//" -e "s/\//./g")
-      echo "      [\"$MODULE\"] = \"$1\","
-    ' sh {} \;
+  for FILE in $(git ls-files "$1" | grep '\.moon$'); do
+    MODULE=$(echo "$FILE" | sed -e "s/\.moon$//" -e "s/\//./g")
+    echo "      [\"$MODULE\"] = \"$FILE\","
+  done
 }
 
 cat <<STOP >"dist/rocks/alive-$VERSION-$REVISION.rockspec"
@@ -100,4 +100,11 @@ if [ -n "$TAG" ]; then
   git add "alv/version.moon" "dist/rocks/alive-$VERSION-$REVISION.rockspec"
   git commit -m "release $TAG"
   git tag -am "version $TAG" "$TAG"
+
+  luarocks make "dist/rocks/alive-$VERSION-$REVISION.rockspec" \
+    --pack-binary-rock \
+    --sign \
+    --pin
+  mv "alive-$VERSION-$REVISION.all.rock" "alive-$VERSION-$REVISION.all.rock.asc" dist/rocks
+  dist/pack-win.sh "$TAG" "$VERSION-$REVISION"
 fi
diff --git a/dist/rocks/alive-scm-1.rockspec b/dist/rocks/alive-scm-1.rockspec
index 05841b8..6f38477 100644
--- a/dist/rocks/alive-scm-1.rockspec
+++ b/dist/rocks/alive-scm-1.rockspec
@@ -33,45 +33,45 @@ build = {
   copy_directories = { "docs" },
   install = {
     lua = {
-      ["alv.result"] = "alv/result.moon",
-      ["alv.stream.io"] = "alv/stream/io.moon",
-      ["alv.stream.base"] = "alv/stream/base.moon",
-      ["alv.stream.value"] = "alv/stream/value.moon",
-      ["alv.stream.event"] = "alv/stream/event.moon",
-      ["alv.stream.init"] = "alv/stream/init.moon",
+      ["alv.ast"] = "alv/ast.moon",
+      ["alv.base.builtin"] = "alv/base/builtin.moon",
+      ["alv.base.fndef"] = "alv/base/fndef.moon",
+      ["alv.base.init"] = "alv/base/init.moon",
+      ["alv.base.input"] = "alv/base/input.moon",
+      ["alv.base.match"] = "alv/base/match.moon",
+      ["alv.base.op"] = "alv/base/op.moon",
       ["alv.builtin"] = "alv/builtin.moon",
       ["alv.cell"] = "alv/cell.moon",
-      ["alv.tag"] = "alv/tag.moon",
       ["alv.copilot"] = "alv/copilot.moon",
-      ["alv.version"] = "alv/version.moon",
+      ["alv.cycle"] = "alv/cycle.moon",
       ["alv.error"] = "alv/error.moon",
+      ["alv.init"] = "alv/init.moon",
       ["alv.invoke"] = "alv/invoke.moon",
-      ["alv.cycle"] = "alv/cycle.moon",
-      ["alv.ast"] = "alv/ast.moon",
-      ["alv.base.builtin"] = "alv/base/builtin.moon",
-      ["alv.base.op"] = "alv/base/op.moon",
-      ["alv.base.fndef"] = "alv/base/fndef.moon",
-      ["alv.base.match"] = "alv/base/match.moon",
-      ["alv.base.input"] = "alv/base/input.moon",
-      ["alv.base.init"] = "alv/base/init.moon",
-      ["alv.registry"] = "alv/registry.moon",
       ["alv.logger"] = "alv/logger.moon",
-      ["alv.init"] = "alv/init.moon",
       ["alv.parsing"] = "alv/parsing.moon",
+      ["alv.registry"] = "alv/registry.moon",
+      ["alv.result"] = "alv/result.moon",
       ["alv.scope"] = "alv/scope.moon",
+      ["alv.stream.base"] = "alv/stream/base.moon",
+      ["alv.stream.event"] = "alv/stream/event.moon",
+      ["alv.stream.init"] = "alv/stream/init.moon",
+      ["alv.stream.io"] = "alv/stream/io.moon",
+      ["alv.stream.value"] = "alv/stream/value.moon",
+      ["alv.tag"] = "alv/tag.moon",
+      ["alv.version"] = "alv/version.moon",
 
-      ["alv-lib.osc"] = "alv-lib/osc.moon",
+      ["alv-lib.logic"] = "alv-lib/logic.moon",
+      ["alv-lib.math"] = "alv-lib/math.moon",
       ["alv-lib.midi"] = "alv-lib/midi.moon",
-      ["alv-lib.sc"] = "alv-lib/sc.moon",
+      ["alv-lib.midi.core"] = "alv-lib/midi/core.moon",
+      ["alv-lib.midi.launchctl"] = "alv-lib/midi/launchctl.moon",
+      ["alv-lib.osc"] = "alv-lib/osc.moon",
       ["alv-lib.pilot"] = "alv-lib/pilot.moon",
       ["alv-lib.random"] = "alv-lib/random.moon",
-      ["alv-lib.util"] = "alv-lib/util.moon",
+      ["alv-lib.sc"] = "alv-lib/sc.moon",
       ["alv-lib.string"] = "alv-lib/string.moon",
-      ["alv-lib.midi.launchctl"] = "alv-lib/midi/launchctl.moon",
-      ["alv-lib.midi.core"] = "alv-lib/midi/core.moon",
       ["alv-lib.time"] = "alv-lib/time.moon",
-      ["alv-lib.logic"] = "alv-lib/logic.moon",
-      ["alv-lib.math"] = "alv-lib/math.moon",
+      ["alv-lib.util"] = "alv-lib/util.moon",
     },
     bin = {
       "bin/alv",