diff --git a/.travis.yml b/.travis.yml index a4977a181975d5170e7e3f926951f236c5721ffa..04f39408a0a3189221a5d2f83b1978a1541a2b7d 100644 --- a/.travis.yml +++ b/.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 diff --git a/scripts/build-docker.sh b/scripts/build-docker.sh index 8a6f7c199c4052e3944ffd8a9e1f38d2fdd5bc5f..7d5c89b12eab0e67465abd016ff91b7ae71e9a5c 100644 --- a/scripts/build-docker.sh +++ b/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 diff --git a/scripts/build.sh b/scripts/build.sh index b51ce138fe0669935f90a3fbf0781c45440b7ff4..09a56d8cb03d9a560fe01e4ebbe22ef8eeafd2e0 100644 --- a/scripts/build.sh +++ b/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