Merge branch 'master' of git@github.com:cncgoko/Goko.git

Author: cncgoko

.travis.yml

@@ -9,7 +9,7 @@ env:
    - TARGET: ftp://ftp.goko.fr//www/download/
    - UPDATE_FOLDER: update
    - updateRepository: true
-   - updateBinaries: false
+   - updateBinaries: true
    - gokoVersion: 0.3.0
 
 cache:
@@ -30,7 +30,9 @@ after_failure:
 deploy:
   provider: bintray
   file: "/home/travis/build/cncgoko/Goko/bintray_descriptor.json"
-  on: master
+  on: 
+    branch: master
+    condition: $updateBinaries = true
   user:
     secure: "G2usVWNBz0jgF94xCLUYS5goZ4Qkalm8nGaJVcbaVgAOnnt1+atCGqVfh7CxTdYOBqD2z0kZOEZ+DEfywo/3Eew8P92I0XAJmw4uXSYhXMCr4N8GED6bUMYCVOnoTHMifK1GiBjznAjIp++Uu6xFD0d+YBskECp+os/ZvA27UYp2OT4iknkDpkPATEJjDHRgzwf+F8E8b6YPXwA2AErVzdJ5kj6PqO9jsbQ8CJJgCNPGp/YxZ+2cFIJzuTcvViWwUjTsBfSRm5NhtnHmkii+INIfFnQSt7wZgcaA0pPuoGb85BCS8OGGrHDcinAVe/eL1wUITdoq876SdwteDQfq4fqThbNvaq/uxi6spURFWkE+5JVwF/XoHlEp+tRL9jKgo2sgHYBfNvI54cPznEae5dB/vgUWPAfm+UYLNiDXsgrll9lONZrAjelqb97VJq8h2G7CpjY3RmXYOR9jVeMKRS06Zpf1RXeL/GIBO5ITK/Omcv3pDG1vJ7lJ+TTScZ46tQ7Eiddnr5CdiVr3ILAJ/s8U1HNPTOV+a90YwmuIGdKYFXXFDObP8MLt0lHhEcECsa2mKMF0Dx1vQ/jX5fPiDHqVxULhLh+upZvaMfg0Va0bSuNkmUfRj/5g56wthvFDk1ZTluc8XwvG64kfBXQueC3w1RItBuPZAdi91l0br8E="
   key: 

deploy.sh

@@ -31,14 +31,14 @@ exportRepository(){
 
 # Export the built binaries to destination
 exportBinaries(){
-  echo "Exporting binaries..."
+#  echo "Exporting binaries..."
 
-  cd $TRAVIS_BUILD_DIR/org.goko.build.product/target/products/
+#  cd $TRAVIS_BUILD_DIR/org.goko.build.product/target/products/
 
-  curl --ftp-create-dirs -T org.goko-win32.win32.x86_64.zip -u $VAR1:$VAR2 $TARGET/$gokoVersion/org.goko-win32.win32.x86_64.zip
-  curl --ftp-create-dirs -T org.goko-win32.win32.x86.zip -u $VAR1:$VAR2 $TARGET/$gokoVersion/org.goko-win32.win32.x86.zip
-  curl --ftp-create-dirs -T org.goko-linux.gtk.x86_64.zip -u $VAR1:$VAR2 $TARGET/$gokoVersion/org.goko-linux.gtk.x86_64.zip
-  curl --ftp-create-dirs -T org.goko-linux.gtk.x86.zip -u $VAR1:$VAR2 $TARGET/$gokoVersion/org.goko-linux.gtk.x86.zip
+#  curl --ftp-create-dirs -T org.goko-win32.win32.x86_64.zip -u $VAR1:$VAR2 $TARGET/$gokoVersion/org.goko-win32.win32.x86_64.zip
+#  curl --ftp-create-dirs -T org.goko-win32.win32.x86.zip -u $VAR1:$VAR2 $TARGET/$gokoVersion/org.goko-win32.win32.x86.zip
+#  curl --ftp-create-dirs -T org.goko-linux.gtk.x86_64.zip -u $VAR1:$VAR2 $TARGET/$gokoVersion/org.goko-linux.gtk.x86_64.zip
+#  curl --ftp-create-dirs -T org.goko-linux.gtk.x86.zip -u $VAR1:$VAR2 $TARGET/$gokoVersion/org.goko-linux.gtk.x86.zip
 
 }
 # Let's do it
@@ -50,9 +50,9 @@ else
   echo "Skipped repository export..."
 fi
 
-if [ $updateBinaries == 'true' ]
-then
-	exportBinaries
-else
-  echo "Skipped binaries export..."
-fi
+#if [ $updateBinaries == 'true' ]
+#then
+#	exportBinaries
+#else
+# echo "Skipped binaries export..."
+#fi