Merge branch 'develop'

.travis.yml

@@ -14,7 +14,4 @@ script:
   - docker run --rm -v $(pwd):${mntdir} fedora:20 /bin/bash -c "sh ${mntdir}/scripts/build-docker.sh fedora"
   - docker run --rm -v $(pwd):${mntdir} opensuse:42.1 /bin/bash -c "sh ${mntdir}/scripts/build-docker.sh opensuse"
   - docker run --rm -v $(pwd):${mntdir} base/archlinux:latest /bin/bash -c "sh ${mntdir}/scripts/build-docker.sh archlinux"
-  #- docker run --rm -v $(pwd):${mntdir} ubuntu:16.04 /bin/bash -c "sh ${mntdir}/scripts/build-docker.sh snap"
-  #- docker run --rm -v $(pwd):${mntdir} ubuntu:16.04 /bin/bash -c "sh ${mntdir}/scripts/build-docker.sh flatpak"
-  #- docker run --rm -v $(pwd):${mntdir} ubuntu:14.04 /bin/bash -c "sh ${mntdir}/scripts/build-docker.sh appimage"
   - cat transfer.log

scripts/build-docker.sh

@@ -92,15 +92,15 @@ build_archlinux() {
     transfer_file "$(find "${PROJDIR}/build_"*${BUILDTYPE} -type f -name "${PKGNAME}*.pkg.tar.xz")"
 }
 
-build_snap() {
+build_appimage() {
     echo 'Not implemented yet'
 }
 
-build_flatpak() {
+build_snap() {
     echo 'Not implemented yet'
 }
 
-build_appimage() {
+build_flatpak() {
     echo 'Not implemented yet'
 }
 
@@ -112,13 +112,13 @@ elif [ "${BUILDTYPE}" = 'opensuse' ]; then
     build_opensuse
 elif [ "${BUILDTYPE}" = 'archlinux' ]; then
     build_archlinux
+elif [ "${BUILDTYPE}" = 'appimage' ]; then
+    build_appimage
 elif [ "${BUILDTYPE}" = 'snap' ]; then
     build_snap
 elif [ "${BUILDTYPE}" = 'flatpak' ]; then
     build_flatpak
-elif [ "${BUILDTYPE}" = 'appimage' ]; then
-    build_appimage
 else
-    echo "sh $(basename "${0}") [ubuntu|fedora|archlinux|snap|flatpak|appimage]"
+    echo "sh $(basename "${0}") [ubuntu|fedora|archlinux|appimage|snap|flatpak]"
     exit 1
 fi

scripts/build.sh

@@ -66,15 +66,15 @@ build_archlinux() {
     makepkg -s
 }
 
-build_snap() {
+build_appimage() {
     echo 'Not implemented yet'
 }
 
-build_flatpak() {
+build_snap() {
     echo 'Not implemented yet'
 }
 
-build_appimage() {
+build_flatpak() {
     echo 'Not implemented yet'
 }
 
@@ -86,13 +86,13 @@ elif [ "${BUILDTYPE}" = 'opensuse' ]; then
     build_opensuse
 elif [ "${BUILDTYPE}" = 'archlinux' ]; then
     build_archlinux
+elif [ "${BUILDTYPE}" = 'appimage' ]; then
+    build_appimage
 elif [ "${BUILDTYPE}" = 'snap' ]; then
     build_snap
 elif [ "${BUILDTYPE}" = 'flatpak' ]; then
     build_flatpak
-elif [ "${BUILDTYPE}" = 'appimage' ]; then
-    build_appimage
 else
-    echo "sh $(basename "${0}") [ubuntu|fedora|archlinux|snap|flatpak|appimage]"
+    echo "sh $(basename "${0}") [ubuntu|fedora|archlinux|appimage|snap|flatpak]"
     exit 1
 fi