Refactor archive library download for AppImage

README.md

@@ -143,9 +143,9 @@ LEGO® is a trademark of the LEGO Group of companies which does not sponsor, aut
 [univention-icon]:     https://raw.githubusercontent.com/trevorsandy/lpub3d/master/builds/utilities/icons/univention.png
 [windows-icon]:        https://raw.githubusercontent.com/trevorsandy/lpub3d/master/builds/utilities/icons/windows.png
 
-[windows-url]:         https://github.com/trevorsandy/lpub3d/releases/download/v2.3.4/LPub3D-2.3.4.1.1083_20181210.exe
-[macos-url]:           https://github.com/trevorsandy/lpub3d/releases/download/v2.3.4/LPub3D-2.3.4.1.1083_20181210-macos.dmg
-[appimage-url]:        https://github.com/trevorsandy/lpub3d/releases/download/v2.3.4/LPub3D-2.3.4.1.1083_20181210-x86_64.AppImage
+[windows-url]:         https://github.com/trevorsandy/lpub3d/releases/download/v2.3.4/LPub3D-2.3.4.1.1084_20181210.exe
+[macos-url]:           https://github.com/trevorsandy/lpub3d/releases/download/v2.3.4/LPub3D-2.3.4.1.1084_20181210-macos.dmg
+[appimage-url]:        https://github.com/trevorsandy/lpub3d/releases/download/v2.3.4/LPub3D-2.3.4.1.1084_20181210-x86_64.AppImage
 
 [arch-url]:            https://download.opensuse.org/repositories/home:/trevorsandy/Arch_Extra/
 [centos-url]:          https://download.opensuse.org/repositories/home:/trevorsandy/CentOS_7/

builds/linux/obs/alldeps/PKGBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Trevor SANDY <trevor[dot]sandy[at]gmail[dot]com>
 # Last Update: December 10, 2018
 pkgname=lpub3d
-pkgver=2.3.4.1083
+pkgver=2.3.4.1084
 pkgrel=1
 pkgdesc="An LDraw Building Instruction Editor"
 url="https://github.com/trevorsandy/lpub3d.git"

builds/linux/obs/alldeps/debian/changelog

@@ -1,5 +1,5 @@
-lpub3d (2.3.4.1083) debian; urgency=medium
+lpub3d (2.3.4.1084) debian; urgency=medium
 
-  * LPub3D version 2.3.4.1.1083_20181210 for Linux
+  * LPub3D version 2.3.4.1.1084_20181210 for Linux
 
- -- Trevor SANDY <[email protected]>  Mon, 10 Dec 2018 19:02:38 +0100
+ -- Trevor SANDY <[email protected]>  Mon, 10 Dec 2018 21:30:12 +0100

builds/linux/obs/alldeps/debian/lpub3d.dsc

@@ -2,7 +2,7 @@ Format: 1.0
 Source: lpub3d
 Binary: lpub3d
 Architecture: any
-Version: 2.3.4.1083
+Version: 2.3.4.1084
 Maintainer: Trevor SANDY <[email protected]>
 Homepage: https://trevorsandy.github.io/lpub3d/
 Standards-Version: 3.9.7

builds/linux/obs/alldeps/lpub3d.spec

@@ -117,7 +117,7 @@ BuildRequires: fdupes
 Summary: An LDraw Building Instruction Editor
 Name: lpub3d
 Icon: lpub3d.xpm
-Version: 2.3.4.1083
+Version: 2.3.4.1084
 Release: <B_CNT>%{?dist}
 URL: https://trevorsandy.github.io/lpub3d
 Vendor: Trevor SANDY
@@ -713,5 +713,5 @@ update-mime-database /usr/share/mime >/dev/null || true
 update-desktop-database || true
 %endif
 
-* Mon Dec 10 2018 - trevor.dot.sandy.at.gmail.dot.com 2.3.4.1083
+* Mon Dec 10 2018 - trevor.dot.sandy.at.gmail.dot.com 2.3.4.1084
 - LPub3D Linux package (rpm) release

builds/utilities/ci/travis/install

@@ -3,7 +3,7 @@
 # Travis-ci build [install] procedures
 #
 #  Trevor SANDY <[email protected]>
-#  Last Update: October 24 2018
+#  Last Update: December 10, 2018
 #  Copyright (c) 2017 - 2018 by Trevor SANDY
 #
 cd $LP3D_BUILD_FOLDER
@@ -56,6 +56,7 @@ if [ "$TRAVIS_OS_NAME" = "osx" ]; then
       brew install qt5;
       brew link --force qt5;
     fi;
+    echo "Downloading archive libraries...";
     wget http://www.ldraw.org/library/updates/complete.zip -O ../complete.zip && cp -f ../complete.zip mainApp/extras;
     wget http://www.ldraw.org/library/unofficial/ldrawunf.zip -O mainApp/extras/lpub3dldrawunf.zip;
     wget https://github.com/trevorsandy/lpub3d_libs/releases/download/v1.0.1/tenteparts.zip -O mainApp/extras/tenteparts.zip;
@@ -76,27 +77,41 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then
     sudo apt-get update -qq;
     sudo apt-get -y install docker-ce;
     docker version;
-    export DOCKER_COMPOSE_VERSION=1.22.0;
+    export DOCKER_COMPOSE_VERSION=1.23.2;
     sudo rm /usr/local/bin/docker-compose;
     curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose;
     chmod +x docker-compose;
     sudo mv docker-compose /usr/local/bin;
     docker-compose version;
   fi;
   if [[ "$LP3D_BUILD_PKG" = "yes" && "$LP3D_BUILD_APPIMAGE" = "true" && -z "$LP3D_COMPILE_SOURCE" && -z "$LP3D_DEPLOY_PACKAGES" ]]; then
-    LP3D_DL_DIR="${LP3D_DIST_DIR_BASE}/trusty"
-    LP3D_GH_DL_URL="https://github.com/trevorsandy/lpub3d_libs/releases/download/v1.0.1"
-    LP3D_LD_DL_URL="http://www.ldraw.org/library"
-    wget ${LP3D_LD_DL_URL}/unofficial/ldrawunf.zip -O ${LP3D_DL_DIR}/lpub3dldrawunf.zip;
-    [ ! -f "${LP3D_DL_DIR}/complete.zip" ] &&  wget ${LP3D_LD_DL_URL}/updates/complete.zip -O ${LP3D_DL_DIR}/complete.zip;
-    [ ! -f "${LP3D_DL_DIR}/tenteparts.zip" ] &&  wget ${LP3D_GH_DL_URL}/tenteparts.zip -O ${LP3D_DL_DIR}/tenteparts.zip;
-    [ ! -f "${LP3D_DL_DIR}/vexiqparts.zip" ] &&  wget ${LP3D_GH_DL_URL}/vexiqparts.zip -O ${LP3D_DL_DIR}/vexiqparts.zip;
-    [ ! -d "../appimagebuild" ] && mkdir -p ../appimagebuild;
+    echo "Download AppImage archive libraries...";
+    if [ ! -d "${LP3D_DIST_DIR_BASE}/trusty" ]; then
+       mkdir -p "${LP3D_DIST_DIR_BASE}/trusty";
+       wget http://www.ldraw.org/library/unofficial/ldrawunf.zip -O ${LP3D_DIST_DIR_BASE}/trusty/lpub3dldrawunf.zip;
+       wget http://www.ldraw.org/library/updates/complete.zip -O ${LP3D_DIST_DIR_BASE}/trusty/complete.zip;
+       wget https://github.com/trevorsandy/lpub3d_libs/releases/download/v1.0.1/tenteparts.zip -O ${LP3D_DIST_DIR_BASE}/trusty/tenteparts.zip;
+       wget https://github.com/trevorsandy/lpub3d_libs/releases/download/v1.0.1/tenteparts.zip -O ${LP3D_DIST_DIR_BASE}/trusty/vexiqparts.zip;
+    else
+       wget http://www.ldraw.org/library/unofficial/ldrawunf.zip -O ${LP3D_DIST_DIR_BASE}/trusty/lpub3dldrawunf.zip;
+       if [ ! -f "${LP3D_DIST_DIR_BASE}/trusty/complete.zip" ]; then
+          wget http://www.ldraw.org/library/updates/complete.zip -O ${LP3D_DIST_DIR_BASE}/trusty/complete.zip;
+       fi
+       if [ ! -f "${LP3D_DIST_DIR_BASE}/trusty/tenteparts.zip" ]; then
+          wget https://github.com/trevorsandy/lpub3d_libs/releases/download/v1.0.1/tenteparts.zip -O ${LP3D_DIST_DIR_BASE}/trusty/tenteparts.zip;
+       fi
+       if [ ! -f "${LP3D_DIST_DIR_BASE}/trusty/vexiqparts.zip" ]; then
+          wget https://github.com/trevorsandy/lpub3d_libs/releases/download/v1.0.1/tenteparts.zip -O ${LP3D_DIST_DIR_BASE}/trusty/vexiqparts.zip;
+       fi
+    fi
+    if [ ! -d "../appimagebuild" ]; then
+       mkdir -p ../appimagebuild;
+    fi
     export AppImageBuildPath=$(cd ../ && echo "$PWD/appimagebuild");
   fi;
 fi
 # setup linux platform-specific 3rd party distribution directory
-if [ "$LP3D_DEPLOY_PACKAGES" = "" ]; then
+if [ -z "$LP3D_DEPLOY_PACKAGES" ]; then
   if [ "$LP3D_BUILD_ARCH" = "true" ]; then
     LP3D_DIST_DIR_PATH=${LP3D_DIST_DIR_BASE}/arch;
   elif [ "$LP3D_BUILD_FEDORA" = "true" ]; then

builds/utilities/version.info

@@ -1 +1 @@
-2 3 4 1 1083 9063a4a
+2 3 4 1 1084 4cfd3eb

mainApp/docs/README.txt

@@ -1,4 +1,4 @@
-LPub3D 2.3.4.1.1083 (10 12 2018 19:02:38)
+LPub3D 2.3.4.1.1084 (10 12 2018 21:30:12)
 
 Features, enhancements, fixes and changes
 ------------

mainApp/docs/RELEASE_NOTES.html

@@ -9,7 +9,7 @@
 <table class="tg">
   <tr>
     <th class="tg-0pky">
-      <h4><a id="LPub3D_0"></a>LPub3D 2.3.4.1.1083 (10 12 2018 19:02:38)</h4>
+      <h4><a id="LPub3D_0"></a>LPub3D 2.3.4.1.1084 (10 12 2018 21:30:12)</h4>
         <hr>
           <p>
              LPub3D version 2.3.3<br>

mainApp/org.trevorsandy.lpub3d.appdata.xml

@@ -68,7 +68,7 @@
         <binary>lpub3d23</binary>
     ​</provides>
     <releases>
-        <release version="2.3.4.1083" date="2018-12-10">
+        <release version="2.3.4.1084" date="2018-12-10">
             <description>
                 <p>LPub3D Linux AppImage package</p>
             </description>