diff --git a/.travis.yml b/.travis.yml index ffd1375b1a13bfb16712ae28881921ae9d6fe60a..2ecc795a6228e1093c071dd913f83a3d2872720d 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.sh ci_ubuntu_deb" - - docker run --rm -v $(pwd):${mntdir} fedora:20 /bin/bash -c "sh ${mntdir}/scripts/package.sh ci_fedora_rpm" - - docker run --rm -v $(pwd):${mntdir} opensuse:42.1 /bin/bash -c "sh ${mntdir}/scripts/package.sh ci_opensuse_rpm" - - docker run --rm -v $(pwd):${mntdir} base/archlinux:latest /bin/bash -c "sh ${mntdir}/scripts/package.sh ci_archlinux_pkg" + - 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" - cat transfer.log diff --git a/pkg/archlinux/PKGBUILD b/pkg/archlinux/PKGBUILD index 17e387e6d714093f8b13aab88bdc483f8dda3306..71e25923a54dfd38be456aa523e2d322ab44d12f 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.sh + sh scripts/prepare } build() { diff --git a/pkg/fedora/ocs-url.spec b/pkg/fedora/ocs-url.spec index 1dd527af161de08f70b7293d9c263e3e63784b8b..feb1176bd073374540d3530786f54b60a284f7f1 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.sh +sh scripts/prepare %build %define debug_package %{nil} diff --git a/pkg/opensuse/ocs-url.spec b/pkg/opensuse/ocs-url.spec index cdb9fa5b60313f9701360d2078675e7b3e1cbdeb..13326fe69a89764468942df6ab7f1c721ca15f64 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.sh +sh scripts/prepare %build %define debug_package %{nil} diff --git a/pkg/ubuntu/debian/rules b/pkg/ubuntu/debian/rules index 25061945abc27574ca10f54fed25872c46f01fcc..d0e16cf811c5520b43acf4a88d4d2de22b335899 100755 --- a/pkg/ubuntu/debian/rules +++ b/pkg/ubuntu/debian/rules @@ -4,7 +4,7 @@ dh $@ override_dh_auto_configure: - sh scripts/prepare.sh + sh scripts/prepare qmake PREFIX=/usr override_dh_auto_install: diff --git a/scripts/package.sh b/scripts/package similarity index 100% rename from scripts/package.sh rename to scripts/package diff --git a/scripts/prepare.sh b/scripts/prepare similarity index 100% rename from scripts/prepare.sh rename to scripts/prepare diff --git a/scripts/scripts.pri b/scripts/scripts.pri index de6b1aab073ed7bf170e9b6c989264bf521db687..3422cff444f1c3a426652e1367c5a4999671d7ee 100644 --- a/scripts/scripts.pri +++ b/scripts/scripts.pri @@ -1,3 +1,3 @@ DISTFILES += \ - $${PWD}/package.sh \ - $${PWD}/prepare.sh + $${PWD}/package \ + $${PWD}/prepare