diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml index f0c5245d2cf02a056d97f2e030b18ee1a6e1c39a..7c6a7e01239742207e6e7f0446390c0e5ca708de 100644 --- a/bitbucket-pipelines.yml +++ b/bitbucket-pipelines.yml @@ -11,7 +11,7 @@ pipelines: - useradd -m pkgbuilder - export HOME=/home/pkgbuilder - chown -R pkgbuilder:pkgbuilder $(pwd) - - sudo -u pkgbuilder sh pkg/build.sh ubuntu + - sudo -u pkgbuilder sh scripts/build.sh ubuntu pkg-build-fedora: - step: image: fedora:20 @@ -23,7 +23,7 @@ pipelines: - useradd -m pkgbuilder - export HOME=/home/pkgbuilder - chown -R pkgbuilder:pkgbuilder $(pwd) - - sudo -u pkgbuilder sh pkg/build.sh fedora + - sudo -u pkgbuilder sh scripts/build.sh fedora pkg-build-archlinux: - step: image: finalduty/archlinux:latest @@ -34,7 +34,7 @@ pipelines: - useradd -m pkgbuilder - export HOME=/home/pkgbuilder - chown -R pkgbuilder:pkgbuilder $(pwd) - - sudo -u pkgbuilder sh pkg/build.sh archlinux + - sudo -u pkgbuilder sh scripts/build.sh archlinux pkg-build-snap: - step: image: ubuntu:16.04 @@ -46,7 +46,7 @@ pipelines: - useradd -m pkgbuilder - export HOME=/home/pkgbuilder - chown -R pkgbuilder:pkgbuilder $(pwd) - - sudo -u pkgbuilder sh pkg/build.sh snap + - sudo -u pkgbuilder sh scripts/build.sh snap pkg-build-appimage: - step: image: ubuntu:14.04 @@ -62,4 +62,4 @@ pipelines: - useradd -m pkgbuilder - export HOME=/home/pkgbuilder - chown -R pkgbuilder:pkgbuilder $(pwd) - - sudo -u pkgbuilder sh pkg/build.sh appimage + - sudo -u pkgbuilder sh scripts/build.sh appimage diff --git a/ocs-url.pro b/ocs-url.pro index 5572f3e42daf17e948a24e22fc65638ee493e93b..7a6c52c793ebfed7ca7880f0535d794419b71e7d 100644 --- a/ocs-url.pro +++ b/ocs-url.pro @@ -13,5 +13,6 @@ include(app/app.pri) include(desktop/desktop.pri) include(i18n/i18n.pri) include(pkg/pkg.pri) +include(scripts/scripts.pri) include(deployment.pri) diff --git a/pkg/archlinux/PKGBUILD b/pkg/archlinux/PKGBUILD index e2be42004698f673cfabd5a2a818b64aca0b2224..0ac8e530a8ebe372bc985750b9147d54b5920dfb 100644 --- a/pkg/archlinux/PKGBUILD +++ b/pkg/archlinux/PKGBUILD @@ -15,7 +15,7 @@ md5sums=() #autofill using updpkgsums prepare() { #cd "${pkgname}-release-${pkgver}" cd "${pkgname}" - sh pkg/import.sh + sh scripts/import.sh } build() { diff --git a/pkg/fedora/ocs-url.spec b/pkg/fedora/ocs-url.spec index 47d8f8222d33643ee3e288ecf1c385481cf8f3b0..b3997134902cf1eff112baffeb1fcbd963c676dc 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 pkg/import.sh +sh scripts/import.sh %build %define debug_package %{nil} diff --git a/pkg/pkg.pri b/pkg/pkg.pri index 3916220abac9399aa25b4c9f993a1253c68760db..2ecc518745aa61d4e37947c2d1e78cd6e5383329 100644 --- a/pkg/pkg.pri +++ b/pkg/pkg.pri @@ -1,6 +1,4 @@ DISTFILES += \ - $${PWD}/build.sh \ - $${PWD}/import.sh \ $${PWD}/ubuntu/debian/changelog \ $${PWD}/ubuntu/debian/compat \ $${PWD}/ubuntu/debian/control \ diff --git a/pkg/snap/snapcraft.yaml b/pkg/snap/snapcraft.yaml index 56c7302dbb4380dc76e67bb25ecfed57ed1effa2..4fdd759885c83af9e063c390dddde1edcc1822fc 100644 --- a/pkg/snap/snapcraft.yaml +++ b/pkg/snap/snapcraft.yaml @@ -12,7 +12,7 @@ confinement: strict parts: ocs-url: prepare: | - sh pkg/import.sh + sh scripts/import.sh plugin: qmake source: ./ qt-version: qt5 diff --git a/pkg/ubuntu/debian/rules b/pkg/ubuntu/debian/rules index ffb1d20848dc3dcb5478eb8e794c239994c2e113..33be3a90e2248e692edaeba54bce693fbf795b02 100755 --- a/pkg/ubuntu/debian/rules +++ b/pkg/ubuntu/debian/rules @@ -4,7 +4,7 @@ dh $@ override_dh_auto_configure: - sh pkg/import.sh + sh scripts/import.sh qmake PREFIX="/usr" override_dh_auto_install: diff --git a/pkg/build.sh b/scripts/build.sh similarity index 100% rename from pkg/build.sh rename to scripts/build.sh diff --git a/pkg/import.sh b/scripts/import.sh similarity index 100% rename from pkg/import.sh rename to scripts/import.sh diff --git a/scripts/scripts.pri b/scripts/scripts.pri new file mode 100644 index 0000000000000000000000000000000000000000..d8d91634794aaf353d96a89eb38607348153cd42 --- /dev/null +++ b/scripts/scripts.pri @@ -0,0 +1,3 @@ +DISTFILES += \ + $${PWD}/build.sh \ + $${PWD}/import.sh