Code cleanup

.travis.yml

@@ -10,7 +10,5 @@ branches:
 
 script:
   - mntdir='/mnt/ocs-manager'
-  #- 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

@@ -25,14 +25,6 @@ transfer_file() {
     fi
 }
 
-build_snap() {
-    echo 'Not implemented yet'
-}
-
-build_flatpak() {
-    echo 'Not implemented yet'
-}
-
 build_appimage() {
     # docker-image: ubuntu:14.04
 
@@ -63,13 +55,21 @@ build_appimage() {
     transfer_file "$(find "${PROJDIR}/build_"*${BUILDTYPE} -type f -name "${PKGNAME}*.AppImage")"
 }
 
-if [ "${BUILDTYPE}" = 'snap' ]; then
+build_snap() {
+    echo 'Not implemented yet'
+}
+
+build_flatpak() {
+    echo 'Not implemented yet'
+}
+
+if [ "${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}") [snap|flatpak|appimage]"
+    echo "sh $(basename "${0}") [appimage|snap|flatpak]"
     exit 1
 fi

scripts/build.sh

@@ -20,14 +20,6 @@ export_srcarchive() {
     $(cd "${PROJDIR}" && git archive --prefix="${PKGNAME}/" --output="${filepath}" HEAD)
 }
 
-build_snap() {
-    echo 'Not implemented yet'
-}
-
-build_flatpak() {
-    echo 'Not implemented yet'
-}
-
 build_appimage() {
     cd "${PROJDIR}"
     mkdir -p "${BUILDDIR}"
@@ -39,13 +31,21 @@ build_appimage() {
     sh appimage.sh
 }
 
-if [ "${BUILDTYPE}" = 'snap' ]; then
+build_snap() {
+    echo 'Not implemented yet'
+}
+
+build_flatpak() {
+    echo 'Not implemented yet'
+}
+
+if [ "${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}") [snap|flatpak|appimage]"
+    echo "sh $(basename "${0}") [appimage|snap|flatpak]"
     exit 1
 fi