From e6c5624127ad6acdafa88290cdd6aec916437a87 Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Mon, 14 May 2018 15:42:15 +0200
Subject: [PATCH] Create "date" directory when deploying nightly build.

The directory is create by simply copying the full directory instead of
individual files.
---
 .travis.yml           |  1 +
 travis/compile_all.py | 31 +++++++++++++++----------------
 travis/deploy.sh      | 25 ++++++++-----------------
 3 files changed, 24 insertions(+), 33 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9620ff2..51c3c86 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,6 +44,7 @@ deploy:
 env:
   global:
     - MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
+    - NIGHTLY_DATE=$(date +%Y-%m-%d)
   matrix:
     - PLATFORM="native_dyn"
     - PLATFORM="native_static"
diff --git a/travis/compile_all.py b/travis/compile_all.py
index 60d0ef9..a239c16 100755
--- a/travis/compile_all.py
+++ b/travis/compile_all.py
@@ -15,20 +15,19 @@ from kiwixbuild import dependency_versions
 
 PLATFORM = environ['PLATFORM']
 TRAVIS_OS_NAME = environ['TRAVIS_OS_NAME']
+HOME = Path(os.path.expanduser('~'))
+NIGHTLY_DATE = environ['NIGHTLY_DATE']
 
-def home():
-    return Path(os.path.expanduser('~'))
-
-BASE_DIR = home()/"BUILD_{}".format(PLATFORM)
-SOURCE_DIR = home()/"SOURCE"
-ARCHIVE_DIR = home()/"ARCHIVE"
-TOOLCHAINS_DIR = home()/"TOOLCHAINS"
-NIGHTLY_KIWIX_ARCHIVES_DIR = home()/'NIGHTLY_KIWIX_ARCHIVES'
-RELEASE_KIWIX_ARCHIVES_DIR = home()/'RELEASE_KIWIX_ARCHIVES'
-NIGHTLY_ZIM_ARCHIVES_DIR = home()/'NIGHTLY_ZIM_ARCHIVES'
-RELEASE_ZIM_ARCHIVES_DIR = home()/'RELEASE_ZIM_ARCHIVES'
-DIST_KIWIX_ARCHIVES_DIR = home()/'DIST_KIWIX_ARCHIVES'
-DIST_ZIM_ARCHIVES_DIR = home()/'DIST_ZIM_ARCHIVES'
+BASE_DIR = HOME/"BUILD_{}".format(PLATFORM)
+SOURCE_DIR = HOME/"SOURCE"
+ARCHIVE_DIR = HOME/"ARCHIVE"
+TOOLCHAINS_DIR = HOME/"TOOLCHAINS"
+NIGHTLY_KIWIX_ARCHIVES_DIR = HOME/'NIGHTLY_KIWIX_ARCHIVES'/NIGHTLY_DATE
+RELEASE_KIWIX_ARCHIVES_DIR = HOME/'RELEASE_KIWIX_ARCHIVES'
+NIGHTLY_ZIM_ARCHIVES_DIR = HOME/'NIGHTLY_ZIM_ARCHIVES'/NIGHTLY_DATE
+RELEASE_ZIM_ARCHIVES_DIR = HOME/'RELEASE_ZIM_ARCHIVES'
+DIST_KIWIX_ARCHIVES_DIR = HOME/'DIST_KIWIX_ARCHIVES'
+DIST_ZIM_ARCHIVES_DIR = HOME/'DIST_ZIM_ARCHIVES'
 SSH_KEY = Path(environ['TRAVIS_BUILD_DIR'])/'travis'/'travisci_builder_id_key'
 
 # We have build everything. Now create archives for public deployement.
@@ -74,7 +73,7 @@ def run_kiwix_build(target, platform, build_deps_only=False, make_release=False,
         command.append('--make-dist')
     print_message("Build {} (deps={}, release={}, dist={})",
         target, build_deps_only, make_release, make_dist)
-    subprocess.check_call(command, cwd=str(home()))
+    subprocess.check_call(command, cwd=str(HOME))
 
 
 def make_archive(project, platform):
@@ -143,7 +142,7 @@ def make_deps_archive(target, full=False):
             dependency_versions.base_deps_versions['pugixml'])]
         if (TOOLCHAINS_DIR).exists():
             files_to_archive.append(TOOLCHAINS_DIR)
-        relative_path = home()
+        relative_path = HOME
 
     with tarfile.open(str(relative_path/archive_name), 'w:gz') as tar:
         for name in files_to_archive:
@@ -180,7 +179,7 @@ try:
     local_filename, headers = urlretrieve(
         'http://tmp.kiwix.org/ci/{}'.format(base_dep_archive_name))
     with tarfile.open(local_filename) as f:
-        f.extractall(str(home()))
+        f.extractall(str(HOME))
 except URLError:
     print_message("Cannot get archive. Build dependencies")
     run_kiwix_build('alldependencies', platform=PLATFORM)
diff --git a/travis/deploy.sh b/travis/deploy.sh
index f2d28bf..b37b8d2 100755
--- a/travis/deploy.sh
+++ b/travis/deploy.sh
@@ -2,8 +2,8 @@
 
 set -e
 
-NIGHTLY_KIWIX_ARCHIVES_DIR=${HOME}/NIGHTLY_KIWIX_ARCHIVES
-NIGHTLY_ZIM_ARCHIVES_DIR=${HOME}/NIGHTLY_ZIM_ARCHIVES
+NIGHTLY_KIWIX_ARCHIVES_DIR=${HOME}/NIGHTLY_KIWIX_ARCHIVES/${NIGHTLY_DATE}
+NIGHTLY_ZIM_ARCHIVES_DIR=${HOME}/NIGHTLY_ZIM_ARCHIVES/${NIGHTLY_DATE}
 RELEASE_KIWIX_ARCHIVES_DIR=${HOME}/RELEASE_KIWIX_ARCHIVES
 RELEASE_ZIM_ARCHIVES_DIR=${HOME}/RELEASE_ZIM_ARCHIVES
 DIST_KIWIX_ARCHIVES_DIR=${HOME}/DIST_KIWIX_ARCHIVES
@@ -12,21 +12,12 @@ SSH_KEY=travis/travisci_builder_id_key
 
 if [[ "$TRAVIS_EVENT_TYPE" = "cron" ]]
 then
-  NIGHTLY_ARCHIVES=$(find $NIGHTLY_KIWIX_ARCHIVES_DIR -type f)
-  if [[ "x$NIGHTLY_ARCHIVES" != "x" ]]
-  then
-    scp -vrp -i ${SSH_KEY} \
-      ${NIGHTLY_ARCHIVES} \
-      nightlybot@download.kiwix.org:/var/www/download.kiwix.org/nightly/$(date +%Y-%m-%d)
-  fi
-
-  NIGHTLY_ARCHIVES=$(find $NIGHTLY_ZIM_ARCHIVES_DIR -type f)
-  if [[ "x$NIGHTLY_ARCHIVES" != "x" ]]
-  then
-    scp -vrp -i ${SSH_KEY} \
-      ${NIGHTLY_ARCHIVES} \
-      nightlybot@download.kiwix.org:/var/www/download.openzim.org/nightly/$(date +%Y-%m-%d)
-  fi
+  scp -vrp -i ${SSH_KEY} \
+    ${NIGHTLY_KIWIX_ARCHIVES_DIR} \
+    nightlybot@download.kiwix.org:/var/www/download.kiwix.org/nightly
+  scp -vrp -i ${SSH_KEY} \
+    ${NIGHTLY_ZIM_ARCHIVES_DIR} \
+    nightlybot@download.kiwix.org:/var/www/download.openzim.org/nightly
 
 elif [[ "x$TRAVIS_TAG" != "x" ]]
 then