diff --git a/.travis.yml b/.travis.yml
index 0e55a9f..c262328 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -94,13 +94,13 @@ deploy:
     script: travis/deploy.sh
     on:
       tags: true
-      condition: $TRAVIS_BUILD_STAGE_NAME != "Build_docker_images" && ($TRAVIS_OS_NAME != "linux" || $DESKTOP_ONLY != 1)
+      condition: $TRAVIS_BUILD_STAGE_NAME != "Build_docker_images"
   - provider: script
     skip_cleanup: true
     script: travis/deploy.sh
     on:
       branch: master
-      condition: $TRAVIS_BUILD_STAGE_NAME != "Build_docker_images" && $TRAVIS_EVENT_TYPE = cron && ( $TRAVIS_OS_NAME != "linux" || $DESKTOP_ONLY != 1 )
+      condition: $TRAVIS_BUILD_STAGE_NAME != "Build_docker_images" && $TRAVIS_EVENT_TYPE = cron
 env:
   global:
     - NIGHTLY_DATE=$(date +%Y-%m-%d)
diff --git a/travis/deploy.sh b/travis/deploy.sh
index ae87191..0acac07 100755
--- a/travis/deploy.sh
+++ b/travis/deploy.sh
@@ -70,7 +70,7 @@ then
   fi
 
   cd ${EXPORT_DIR}/GIT
-  GIT_REPOS=$(ls -d */)
+  GIT_REPOS=$(ls -l | awk '/^d/ { print $9 }')
   if [[ "x$GIT_REPOS" != "x" ]]
   then
     for repo in $GIT_REPOS