Merge remote-tracking branch 'refs/remotes/drebs/add-debian-package-build-script' into develop

4 files changed, 41 insertions, 14 deletions

diff --git a/scripts/README.rst b/scripts/README.rst
index fdd1d642..37cf2c0e 100644
--- a/scripts/README.rst
+++ b/scripts/README.rst
@@ -2,16 +2,3 @@ Soledad Scripts
 ===============
 
 The scripts in this directory are meant to be used for development purposes.
-
-Currently, the scripts are:
-
-  * server-side-db.py: Gives access to server-side soledad user database,
-    based on the configuration in /etc/leap/soledad-server.conf. One should
-    use it as:
-
-      python -i server-side-db.py <uuid>
-
-  * client-side-db.py: Gives access to client-side soledad user database,
-    based on data stored in ~/.config/leap/soledad. One should use it as:
-
-      python -i client-side-db.py <uuid> <passphrase>
diff --git a/scripts/build_debian_package.sh b/scripts/build_debian_package.sh
new file mode 100755
index 00000000..cc62c3ac
--- /dev/null
+++ b/scripts/build_debian_package.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+# This script generates Soledad Debian packages.
+#
+# When invoking this script, you should pass a git repository URL and the name
+# of the branch that contains the code you wish to build the packages from.
+#
+# The script will clone the given branch from the given repo, as well as the
+# main Soledad repo in github which contains the most up-to-date debian
+# branch. It will then merge the desired branch into the debian branch and
+# build the packages.
+
+if [ $# -ne 2 ]; then
+  echo "Usage: ${0} <url> <branch>"
+  exit 1
+fi
+
+SOLEDAD_MAIN_REPO=git://github.com/leapcode/soledad.git
+
+url=$1
+branch=$2
+workdir=`mktemp -d`
+
+git clone -b ${branch} ${url} ${workdir}/soledad
+export GIT_DIR=${workdir}/soledad/.git
+export GIT_WORK_TREE=${workdir}/soledad
+git remote add leapcode ${SOLEDAD_MAIN_REPO}
+git fetch leapcode
+git checkout debian
+git merge --no-edit ${branch}
+(cd ${workdir}/soledad && debuild -uc -us)
+echo "Packages generated in ${workdir}"
diff --git a/scripts/client-side-db.py b/scripts/client_side_db.py
index 0c3df7a4..6d1843ac 100644
--- a/scripts/client-side-db.py
+++ b/scripts/client_side_db.py
@@ -1,7 +1,11 @@
 #!/usr/bin/python
 
 # This script gives client-side access to one Soledad user database by using
-# the data stored in ~/.config/leap/soledad/
+# the data stored in the appropriate config dir given by get_path_prefix().
+#
+# Use it like this:
+#
+#     python -i client-side-db.py <uuid> <passphrase>
 
 import sys
 import os
diff --git a/scripts/server-side-db.py b/scripts/server_side_db.py
index 01a9aaac..18641a0f 100644
--- a/scripts/server-side-db.py
+++ b/scripts/server_side_db.py
@@ -2,6 +2,10 @@
 
 # This script gives server-side access to one Soledad user database by using
 # the configuration stored in /etc/leap/soledad-server.conf.
+#
+# Use it like this:
+# 
+#     python -i server-side-db.py <uuid>
 
 import sys
 from ConfigParser import ConfigParser