From 2ad3bb39e58f594ea1299a2b4ed36ee3f63e49d4 Mon Sep 17 00:00:00 2001
From: tv <tv@nomic.retiolum>
Date: Wed, 6 Nov 2013 17:27:07 +0100
Subject: ship: mv bin src && mv out tmp

---
 .gitignore            |  2 +-
 ship/bin/punani       |  4 ----
 ship/deploy           | 10 +++++-----
 ship/out/.placeholder |  0
 ship/src/punani       |  4 ++++
 ship/tmp/.placeholder |  0
 6 files changed, 10 insertions(+), 10 deletions(-)
 delete mode 100755 ship/bin/punani
 delete mode 100644 ship/out/.placeholder
 create mode 100755 ship/src/punani
 create mode 100644 ship/tmp/.placeholder

diff --git a/.gitignore b/.gitignore
index 4ccc216f..e2b93f24 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,6 @@ a.out
 /ovh/soapi/SOAPpy
 /Reaktor/IRC/irclib.py
 /Reaktor/public_commands/*
-/ship/out
+/ship/tmp
 /webchat/node_modules
 /webchat/local_config
diff --git a/ship/bin/punani b/ship/bin/punani
deleted file mode 100755
index ceabd667..00000000
--- a/ship/bin/punani
+++ /dev/null
@@ -1,4 +0,0 @@
-#! /bin/sh
-#@info
-#@include punani
-punani "$@"
diff --git a/ship/deploy b/ship/deploy
index 411f8eec..cb71d570 100755
--- a/ship/deploy
+++ b/ship/deploy
@@ -1,9 +1,9 @@
 #!/bin/sh
 set -xeuf
 cd $(dirname $0)
-bindir=$PWD/bin
-libdir=$PWD/lib
-outdir=$PWD/out
-for file in `ls -1 $bindir`;do
-  BUILD_PATH=$libdir ./build compile $bindir/$file $outdir/$file
+exesrcdir=src
+libsrcdir=lib
+tmpoutdir=tmp
+for file in `ls $exesrcdir`; do
+  BUILD_PATH=$libsrcdir ./build compile $exesrcdir/$file $tmpoutdir/$file
 done
diff --git a/ship/out/.placeholder b/ship/out/.placeholder
deleted file mode 100644
index e69de29b..00000000
diff --git a/ship/src/punani b/ship/src/punani
new file mode 100755
index 00000000..ceabd667
--- /dev/null
+++ b/ship/src/punani
@@ -0,0 +1,4 @@
+#! /bin/sh
+#@info
+#@include punani
+punani "$@"
diff --git a/ship/tmp/.placeholder b/ship/tmp/.placeholder
new file mode 100644
index 00000000..e69de29b
-- 
cgit v1.2.3