From 1f24868c6eb26d8a053530c3685bc286d173a58a Mon Sep 17 00:00:00 2001
From: Piotr Maslanka <piotr.maslanka@henrietta.com.pl>
Date: Sat, 25 Mar 2017 12:44:37 +0100
Subject: [PATCH] meta
---
cass_zk_rmq/DESCRIPTION | 1 -
cass_zk_rmq/README.md | 2 ++
cassandra/DESCRIPTION | 1 -
cassandra/README.md | 1 +
czr_pythons/DESCRIPTION | 1 -
czr_pythons/README.md | 2 ++
czr_pythons_pg/DESCRIPTION | 1 -
czr_pythons_pg/README.md | 2 ++
make.py | 8 ++++----
nodejs4/DESCRIPTION | 1 -
nodejs4/README.md | 2 ++
nodejs5_jdk_adk25/DESCRIPTION | 1 -
nodejs5_jdk_adk25/README.md | 2 ++
run.sh | 2 +-
14 files changed, 16 insertions(+), 11 deletions(-)
delete mode 100644 cass_zk_rmq/DESCRIPTION
delete mode 100644 cassandra/DESCRIPTION
delete mode 100644 czr_pythons/DESCRIPTION
delete mode 100644 czr_pythons_pg/DESCRIPTION
delete mode 100644 nodejs4/DESCRIPTION
delete mode 100644 nodejs5_jdk_adk25/DESCRIPTION
diff --git a/cass_zk_rmq/DESCRIPTION b/cass_zk_rmq/DESCRIPTION
deleted file mode 100644
index 15e1fd5..0000000
--- a/cass_zk_rmq/DESCRIPTION
+++ /dev/null
@@ -1 +0,0 @@
-Cassandra, ZooKeeper, RabbitMQ
\ No newline at end of file
diff --git a/cass_zk_rmq/README.md b/cass_zk_rmq/README.md
index e1a7693..7ba2cd8 100644
--- a/cass_zk_rmq/README.md
+++ b/cass_zk_rmq/README.md
@@ -1,5 +1,7 @@
# cass_zk_mq
+Cassandra, ZooKeeper, RabbitMQ
+
Added:
* curl
* Sun Java 8
diff --git a/cassandra/DESCRIPTION b/cassandra/DESCRIPTION
deleted file mode 100644
index a218ac4..0000000
--- a/cassandra/DESCRIPTION
+++ /dev/null
@@ -1 +0,0 @@
-Debian Jessie x86_64 with Cassandra 3.0.9
\ No newline at end of file
diff --git a/cassandra/README.md b/cassandra/README.md
index 1d056c2..5beb433 100644
--- a/cassandra/README.md
+++ b/cassandra/README.md
@@ -1,5 +1,6 @@
# cassandra
+Debian Jessie x86_64 with Cassandra 3.0.9
Added:
* curl
diff --git a/czr_pythons/DESCRIPTION b/czr_pythons/DESCRIPTION
deleted file mode 100644
index 43b9777..0000000
--- a/czr_pythons/DESCRIPTION
+++ /dev/null
@@ -1 +0,0 @@
-Cassandra, ZooKeeper, RabbitMQ and assorted Pythons
\ No newline at end of file
diff --git a/czr_pythons/README.md b/czr_pythons/README.md
index f97e172..1ac9085 100644
--- a/czr_pythons/README.md
+++ b/czr_pythons/README.md
@@ -1,5 +1,7 @@
# czr_pythons
+Cassandra, ZooKeeper, RabbitMQ and assorted Pythons
+
It's [cass_zk_rmq](/cass_zk_rmq) but with extra:
* build-essentials
* git
diff --git a/czr_pythons_pg/DESCRIPTION b/czr_pythons_pg/DESCRIPTION
deleted file mode 100644
index 63bfdda..0000000
--- a/czr_pythons_pg/DESCRIPTION
+++ /dev/null
@@ -1 +0,0 @@
-czr_pythons but with PostgreSQL
\ No newline at end of file
diff --git a/czr_pythons_pg/README.md b/czr_pythons_pg/README.md
index 7abd432..3757c8e 100644
--- a/czr_pythons_pg/README.md
+++ b/czr_pythons_pg/README.md
@@ -1,5 +1,7 @@
# czr_pythons_pg
+czr_pythons but with PostgreSQL
+
It's [cass_zk_rmq](/cass_zk_rmq) but with extra:
* build-essentials
* git
diff --git a/make.py b/make.py
index ab7a872..354f04d 100644
--- a/make.py
+++ b/make.py
@@ -48,8 +48,8 @@ build_$BOX:
# README.md
index = []
for box in boxes:
- with open(os.path.join(box, 'DESCRIPTION'), 'rb') as mdin:
- description = mdin.read().strip()
+ with open(os.path.join(box, 'README.md'), 'rb') as mdin:
+ description = mdin.readlines()[2].strip()
index.append(
u'* **$BOX**: [$DESCRIPTION](/$BOX/README.md)\n'.replace('$DESCRIPTION', description).replace('$BOX',
@@ -94,8 +94,8 @@ Boxes, after being built, will be automatically available at
if ' '.join(sys.argv).endswith('meta'):
box = os.path.split(os.getcwd())[-1]
- with open('DESCRIPTION', 'rb') as mdin, open('metadata.json', 'wb') as mdout:
- description = mdin.read().strip()
+ with open('README.md', 'rb') as mdin, open('metadata.json', 'wb') as mdout:
+ description = mdin.readlines()[2].strip()
mdout.write('''{
diff --git a/nodejs4/DESCRIPTION b/nodejs4/DESCRIPTION
deleted file mode 100644
index d285119..0000000
--- a/nodejs4/DESCRIPTION
+++ /dev/null
@@ -1 +0,0 @@
-NodeJS 4 + bower + gulp
\ No newline at end of file
diff --git a/nodejs4/README.md b/nodejs4/README.md
index 3c26c07..26ebf57 100644
--- a/nodejs4/README.md
+++ b/nodejs4/README.md
@@ -1,5 +1,7 @@
# nodejs4
+NodeJS 4 + bower + gulp
+
* NodeJS 4.x
* bower
* gulp
diff --git a/nodejs5_jdk_adk25/DESCRIPTION b/nodejs5_jdk_adk25/DESCRIPTION
deleted file mode 100644
index f62f671..0000000
--- a/nodejs5_jdk_adk25/DESCRIPTION
+++ /dev/null
@@ -1 +0,0 @@
-odeJS 5.x + JDK + ADT + cordova
\ No newline at end of file
diff --git a/nodejs5_jdk_adk25/README.md b/nodejs5_jdk_adk25/README.md
index a6e908f..2bf9eff 100644
--- a/nodejs5_jdk_adk25/README.md
+++ b/nodejs5_jdk_adk25/README.md
@@ -1,5 +1,7 @@
# nodejs5_jdk_adk25
+odeJS 5.x + JDK + ADT + cordova
+
* NodeJS 5.12
* bower
* gulp
diff --git a/run.sh b/run.sh
index e21421d..9b2bc6d 100644
--- a/run.sh
+++ b/run.sh
@@ -2,7 +2,7 @@
shutdown -h +30 "Timeout on VM creation"
-if [ ! -f "/vagrant/build.sh" ]; then
+if [ ! -e "/vagrant/build.sh" ]; then
sudo -H -u vagrant bash /vagrant/build_as_vagrant.sh
else
bash /vagrant/build.sh
--
GitLab