diff --git a/.travis.yml b/.travis.yml index 2ecc795a6228e1093c071dd913f83a3d2872720d..5164098006e4e35870dfc3b93925ee51e178246c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,8 +10,8 @@ branches: script: - mntdir='/mnt/ocs-url' - - docker run --rm -v $(pwd):${mntdir} ubuntu:14.04 /bin/bash -c "sh ${mntdir}/scripts/package ci_ubuntu_deb" - - docker run --rm -v $(pwd):${mntdir} fedora:20 /bin/bash -c "sh ${mntdir}/scripts/package ci_fedora_rpm" - - docker run --rm -v $(pwd):${mntdir} opensuse:42.1 /bin/bash -c "sh ${mntdir}/scripts/package ci_opensuse_rpm" - - docker run --rm -v $(pwd):${mntdir} base/archlinux:latest /bin/bash -c "sh ${mntdir}/scripts/package ci_archlinux_pkg" + - docker run --rm -v $(pwd):${mntdir} ubuntu:14.04 /bin/bash -c "${mntdir}/scripts/package ci_ubuntu_deb" + - docker run --rm -v $(pwd):${mntdir} fedora:20 /bin/bash -c "${mntdir}/scripts/package ci_fedora_rpm" + - docker run --rm -v $(pwd):${mntdir} opensuse:42.1 /bin/bash -c "${mntdir}/scripts/package ci_opensuse_rpm" + - docker run --rm -v $(pwd):${mntdir} base/archlinux:latest /bin/bash -c "${mntdir}/scripts/package ci_archlinux_pkg" - cat transfer.log diff --git a/pkg/archlinux/PKGBUILD b/pkg/archlinux/PKGBUILD index 71e25923a54dfd38be456aa523e2d322ab44d12f..d7cccf3754b160e86cf6dc7eecee3977f69a28ce 100644 --- a/pkg/archlinux/PKGBUILD +++ b/pkg/archlinux/PKGBUILD @@ -16,7 +16,7 @@ md5sums=() #autofill using updpkgsums prepare() { #cd "${pkgname}-release-${pkgver}" cd "${pkgname}" - sh scripts/prepare + ./scripts/prepare } build() { diff --git a/pkg/fedora/ocs-url.spec b/pkg/fedora/ocs-url.spec index feb1176bd073374540d3530786f54b60a284f7f1..1e9f5aeb42ca943e142c4659cc71036debef43f2 100644 --- a/pkg/fedora/ocs-url.spec +++ b/pkg/fedora/ocs-url.spec @@ -18,7 +18,7 @@ An install helper program for items served on OpenCollaborationServices (OCS). %prep #%%autosetup -n %{name}-release-%{version} %autosetup -n %{name} -sh scripts/prepare +./scripts/prepare %build %define debug_package %{nil} diff --git a/pkg/opensuse/ocs-url.spec b/pkg/opensuse/ocs-url.spec index 13326fe69a89764468942df6ab7f1c721ca15f64..a55c7e0650df64159657f92a09f07cd4686a558e 100644 --- a/pkg/opensuse/ocs-url.spec +++ b/pkg/opensuse/ocs-url.spec @@ -18,7 +18,7 @@ An install helper program for items served on OpenCollaborationServices (OCS). %prep #%%autosetup -n %{name}-release-%{version} %autosetup -n %{name} -sh scripts/prepare +./scripts/prepare %build %define debug_package %{nil} diff --git a/pkg/ubuntu/debian/rules b/pkg/ubuntu/debian/rules index d0e16cf811c5520b43acf4a88d4d2de22b335899..3451beb8c82c56e821e458ec839bf189383a6dd8 100755 --- a/pkg/ubuntu/debian/rules +++ b/pkg/ubuntu/debian/rules @@ -4,7 +4,7 @@ dh $@ override_dh_auto_configure: - sh scripts/prepare + ./scripts/prepare qmake PREFIX=/usr override_dh_auto_install: diff --git a/scripts/package b/scripts/package old mode 100644 new mode 100755 index 9aab1b55b254bb8e37daa3a84f61f44e3433f5c2..377493a4f09e5f6d8b8741926107dc0ede92d043 --- a/scripts/package +++ b/scripts/package @@ -19,7 +19,7 @@ ci_ubuntu_deb() { # docker-image: ubuntu:14.04 useradd -m ${PKGUSER} chown -R ${PKGUSER} "${PROJDIR}" - su -c "export HOME=/home/${PKGUSER} && sh "${PKGSCRIPT}" build_ubuntu_deb" ${PKGUSER} + su -c "export HOME=/home/${PKGUSER} && "${PKGSCRIPT}" build_ubuntu_deb" ${PKGUSER} transfer_file "$(find "${BUILDDIR}" -type f -name "${PKGNAME}*.deb")" } @@ -42,7 +42,7 @@ ci_fedora_rpm() { # docker-image: fedora:20 useradd -m ${PKGUSER} chown -R ${PKGUSER} "${PROJDIR}" - su -c "export HOME=/home/${PKGUSER} && sh "${PKGSCRIPT}" build_fedora_rpm" ${PKGUSER} + su -c "export HOME=/home/${PKGUSER} && "${PKGSCRIPT}" build_fedora_rpm" ${PKGUSER} transfer_file "$(find "${BUILDDIR}" -type f -name "${PKGNAME}*.rpm")" } @@ -66,7 +66,7 @@ ci_opensuse_rpm() { # docker-image: opensuse:42.1 useradd -m ${PKGUSER} chown -R ${PKGUSER} "${PROJDIR}" - su -c "export HOME=/home/${PKGUSER} && sh "${PKGSCRIPT}" build_opensuse_rpm" ${PKGUSER} + su -c "export HOME=/home/${PKGUSER} && "${PKGSCRIPT}" build_opensuse_rpm" ${PKGUSER} transfer_file "$(find "${BUILDDIR}" -type f -name "${PKGNAME}*.rpm")" } @@ -89,7 +89,7 @@ ci_archlinux_pkg() { # docker-image: base/archlinux:latest useradd -m ${PKGUSER} chown -R ${PKGUSER} "${PROJDIR}" - su -c "export HOME=/home/${PKGUSER} && sh "${PKGSCRIPT}" build_archlinux_pkg" ${PKGUSER} + su -c "export HOME=/home/${PKGUSER} && "${PKGSCRIPT}" build_archlinux_pkg" ${PKGUSER} transfer_file "$(find "${BUILDDIR}" -type f -name "${PKGNAME}*.pkg.tar.xz")" } diff --git a/scripts/prepare b/scripts/prepare old mode 100644 new mode 100755