From 05841163793a5dae10a945369bd445830082f8ae Mon Sep 17 00:00:00 2001
From: Akira Ohgaki <akiraohgaki@gmail.com>
Date: Mon, 27 Feb 2017 08:08:40 +0900
Subject: [PATCH] Move script files into scripts
---
bitbucket-pipelines.yml | 10 +++++-----
ocs-url.pro | 1 +
pkg/archlinux/PKGBUILD | 2 +-
pkg/fedora/ocs-url.spec | 2 +-
pkg/pkg.pri | 2 --
pkg/snap/snapcraft.yaml | 2 +-
pkg/ubuntu/debian/rules | 2 +-
{pkg => scripts}/build.sh | 0
{pkg => scripts}/import.sh | 0
scripts/scripts.pri | 3 +++
10 files changed, 13 insertions(+), 11 deletions(-)
rename {pkg => scripts}/build.sh (100%)
rename {pkg => scripts}/import.sh (100%)
create mode 100644 scripts/scripts.pri
diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
index f0c5245..7c6a7e0 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 5572f3e..7a6c52c 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 e2be420..0ac8e53 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 47d8f82..b399713 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 3916220..2ecc518 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 56c7302..4fdd759 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 ffb1d20..33be3a9 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 0000000..d8d9163
--- /dev/null
+++ b/scripts/scripts.pri
@@ -0,0 +1,3 @@
+DISTFILES += \
+ $${PWD}/build.sh \
+ $${PWD}/import.sh
--
GitLab