Merge branch '110-gitlab-ci-multi-runner-init-script' into 'master'

Resolve "gitlab-ci-multi-runner init script"

Closes #110

See merge request !186

dev-vcs/gitlab-ci-multi-runner/ChangeLog

@@ -1,3 +1,8 @@
+  30 Jul 2017; Manuel Friedli <manuel@fritteli.ch>
+  +files/gitlab-ci-multi-runner-9.3.0.init,
+  gitlab-ci-multi-runner-9.3.0-r1.ebuild, gitlab-ci-multi-runner-9.4.1.ebuild:
+  dev-vcs/gitlab-ci-multi-runner:  Hopefully fix the init script.
+
   30 Jul 2017; Manuel Friedli <manuel@fritteli.ch>
   gitlab-ci-multi-runner-9.3.0-r1.ebuild, gitlab-ci-multi-runner-9.4.1.ebuild:
   dev-vcs/gitlab-ci-multi-runner:  Fix name of installed binary.

dev-vcs/gitlab-ci-multi-runner/Manifest

@@ -2,6 +2,7 @@ AUX 0001-fix-Makefile-1.10.4.patch 3308 SHA256 c87a85a704ee054f85343d01e187933e6
 AUX 0001-fix-Makefile-1.11.1.patch 3376 SHA256 1c8123815ed8df86942b4cfd11b8c91e7a08945664e97df11b6f34cc583a093e SHA512 2bb4dd17cd47f85799932e09294244d899361b152ff47b0883c985b989b1c222a0bec8090e7692d1eea0655969883fad400d0c5a68c07dde0cefe67f6775654d WHIRLPOOL da952b735599208091b028aaf3b32077c63e24c4796226975b22aef7c57bb7d1b2872a96b21ce877bdf46b761295b6e602a5eacdb7e3c4e58c07b34801f650e7
 AUX 0001-fix-Makefile-1.8.0.patch 3281 SHA256 70db95de830679916f1a0c446a5eb42ebdc77446d2a46e31f919107ea452d0a0 SHA512 d73db4e0122741da7bd7be9fd5a2b36c4aaeb0b3b0789604cefe1e98a613c0e5141299d7764b694080ccd8ff9094e8f0b134c950339e2f4ced31d8851f2fe63f WHIRLPOOL 24a3459cf882281b57bfbfb8471fc0f6ce1d0630ecd360d1fd813663f35a500f9f3cc826b89df0069d62d23f6d8cf0d0405254e967fc4c2eba0abf635f5da29b
 AUX 0001-fix-Makefile.patch 3401 SHA256 d764379ad6b027eaab6e6f8a3874befad9567e5114caa247843d9abad29bf10e SHA512 12a44684aa05df41dea29e66bf42ec6a6b40f06b1a9c8a2682c5ce7a62264b1135df3a69f98cd9bf10bc05da062c61cfa02f803226d022ed9ebaf0bf6469449b WHIRLPOOL cdab4d9382f522ef136e77eeb38c7532172bc538e95254c4e57dfdf9b277d10f469211350994a228529142dc07d04f1df89a81acac01665ca2c9c9961f7da65a
+AUX gitlab-ci-multi-runner-9.3.0.init 702 SHA256 124ad23c8af197e861a290bb5316fc23f100b7e25a5b1d8b169bb8adff39e3b7 SHA512 5f44e4245a5ccd6fe55484e8cb8a4254608fe02b37c151c472acafbe75bc8767b67fc28b8edef318114b5cfff1e3c7bb4b0bf7df28e9445e95784536fe0e6996 WHIRLPOOL ae1d3c4e4501bafee4252da7217a18791dccf318858877aa7cf84a37ed35a1bffda2e8e6e87ef4098816a4290cd5abbfb176aab83219e6176938fdf6e913fc9e
 AUX gitlab-ci-multi-runner.conf 44 SHA256 0b93ba53d557fbf603b50f6d78eb2c4415b9a79f056142b6edf4a63fc6612d6e SHA512 1f5ff480740b18fc985ae9337b8dc4ddd1bde5253e09042b5542cb9a3db54b9cef1f7b24445c829eb83fcfd8751b693018154f6b97ce0a6e723d5d71d9a27429 WHIRLPOOL fc5218c55917b3303baf649fbafaf1dc50cf52d0ee04852716defe4f21b806f4f313071b1c55920d89da66180405d35da0f7cca73c2617b70bcaa67f725cab2a
 AUX gitlab-ci-multi-runner.init 662 SHA256 faf47cdc02b78527d98cd044f2d2aed38a44e39fc6aa5ccc6249c6bce7b979b2 SHA512 9a2f6bcac4c1b992aa5f046cc2cf8f379d2b1f5b6d8065793996828be1527fb5e9131b2967131c292003319f2b27c0cb1229a147236279027e11d13f73e9bd76 WHIRLPOOL 7ffb5d25cb5bd66459981fb71a79d4690b1efaff41e5873431b8ec9cae62783c9fb71ea426a0a1d8f0bf9fdd7dbcb569136dc38f7736296565258a0dcfa3536f
 DIST gitlab-ci-multi-runner-1.10.4-prebuilt-arm.tar.xz 8698116 SHA256 f3622932cc0e1013e9b999df68f00e6cfde148f56590cc2336806c9136b94dd3 SHA512 8ff0967105a0cd7d5041823b677a1bb990620c7cfe40975768691b738e37f72394323616c1783add5622696e645916caed18722d6b242974f49ee3da658bee8a WHIRLPOOL 7b76346e3de324bdc647e07cdfb2041af2574d1c4f885783661d5931a7bfc5864424f9f279cb3e3ca391194a2dd6a529a57ec2de831b06ed56d929fdb45c2d7c
@@ -30,7 +31,7 @@ EBUILD gitlab-ci-multi-runner-1.11.1.ebuild 3267 SHA256 a63c1a0112653c298ed03bda
 EBUILD gitlab-ci-multi-runner-1.7.0.ebuild 3250 SHA256 fc9f976619ff9ddedaceee812dd2babcb1fb7d7236868368d23a5b67b60bd08b SHA512 276835a37b5be71c8663f92bb093c568ecdcae69d45a88a9ce3ccf896cefd3d59a7f8bfce43eed7de72744e4a60b110b8ca9ae8c2fed94f62c0da475e5c40a50 WHIRLPOOL cc4796822e8443f81f958c8fa39475fb1b168ca06b7e8c38f148b91b77da033c1113c88dd818aaf14265ea07ade5de367235168cdf6e2ccb276ffd45538e9812
 EBUILD gitlab-ci-multi-runner-1.8.0.ebuild 3258 SHA256 d54d70f365868526144decb5671c834bf259d8b8659ec57a8ed9cd55cb6589da SHA512 7023a29d0615b986ef6d0fb0f2ca3ba9f0c0cca095b739cb7da63eb13cb4bee413978807032a674bd5876da9eda198a8fbb11be44c5fe43099e8e98148524b10 WHIRLPOOL c77aaa33c1d24a278cf53d63aa54052c5bddc5c671d2189457b209dcd8a8bf4c911f50be6478c613ba111a709f500f2fb4ba98399fc78a5ece897c852b79d4a4
 EBUILD gitlab-ci-multi-runner-1.9.2.ebuild 3258 SHA256 2d753e9effbba47ddce697875a94572ea44a866fd4988924d38c5f3e87030f14 SHA512 7e691285841aad5fd200e83ed039cf24f3185d18d4b55545f2f325b9fbb6affc30e54ec1aa104799d3cdbfbdbfc4ad96c481485e8f5ce40753ad17b4dc5084d9 WHIRLPOOL 6b00e7b8446c6b78502f2fca6dcf752273245a8a71830fb968a286ae6cf1f0029285a547e0c568ae668315006a39cf9880e0db384504f428538c4810e11805f6
-EBUILD gitlab-ci-multi-runner-9.3.0-r1.ebuild 2196 SHA256 4af348d1b1313227ae211dda201592d9dfcc4feb15778c2cb9bb1ecc85b0c66f SHA512 725c5f915648782f566a4794bf392f462bfdc1c36022e89b379976c56e28d5880a1574ef9b7f05331e43c1bf96fe084d871ba673d9e632d479bb17d565232360 WHIRLPOOL 4ed636d6e17e92f008c1ff2c2493359530dd25bbc6660d352b312c7126f598848807cdc71109480c954012d73d138f7e2a2cfb9ee6c25fccf74906e785d58af9
+EBUILD gitlab-ci-multi-runner-9.3.0-r1.ebuild 2202 SHA256 1c30ab4cb44f7f7af1d0847bc632783e8ce0277f16a2a3ea99b6fddb8ac32d06 SHA512 e0fc63b37dcce9205ab7ea9c6389e0d90878593d8cad858e3c347d8f8b790c7bdd1a52d883f1680fba6614fb556d40dcbfe9b2729de2a35df0a3b15ad07c0faf WHIRLPOOL b962cf07c83b20cd8bf972d2272e026c812baad28882454d227dacd3c5ce5150f4fc5d15b90c5777ed09b4264d8c91bef98481c0f63f91b5eb5582faf18bdbc4
-EBUILD gitlab-ci-multi-runner-9.4.1.ebuild 2310 SHA256 ffff8c01867871157a5b59dc1ca026adfe6b60f4651fd078405c42806c6c5d70 SHA512 93daa79d50ffdc869e4e9ed98de69684d19254c768e48cc4f59b267dbe37acec7fabe8bbdb4539b18f3a4d3182b61a9fa7554e34713ec0e813bb9c6ef3e76b42 WHIRLPOOL a5474baf726f7a133036bc6a072ff793bba98b5a88cc9de105cbe2d37bcb0786ed33f92d80d185a624be89994d662d5c950fc2a955612e5b27ecfebf2da97706
+EBUILD gitlab-ci-multi-runner-9.4.1.ebuild 2316 SHA256 617f690ea56a95b2e6b217b51e6186b04b6a76703f217aa5333ddde71098bf93 SHA512 06120bd596aace380cde530e30bb41eea192ce5107bb894e0b5d4e93ba78dca92593674b1cb239a101ddd0d753b6f0a27ddf23a2d00b1fd3d825115fb018dcc8 WHIRLPOOL 7d34f0564ce7955e08a1e5abcb0a51768becf8021d86675bc04f728715e04b69f6427a3a95c1de9e17f7751d10e96ac9c470ff13fea232fcc2072446635b4db0
-MISC ChangeLog 2284 SHA256 0448e4e706261ea32ea6a77478acc6f52aeb9e5ba9bdd5a30cc830ba1d47ab58 SHA512 f29f4107cc0c86c0da58a46b4bdfe496987c3469ec733e728f2038bac9c5d38098abd176c81d68e16218602fe45ed9bd327002924ad7639c1a0bf9a48d84cad9 WHIRLPOOL 84113f685a36369b20eea32a8f3ac948c4868c94d0b9ca2f87ef8f46c29a805a1cbcbfcb02a45fd717adf96a67b89759d728fa263faef182905ac580dee95eb1
+MISC ChangeLog 2525 SHA256 e06558a71acc9c44d0069e508396ba0c0eb0df2815761656e83eea49294b8c4a SHA512 a34059729791ccd1e59f44aa5c604f18f7788d5601950f045cd7341f37b9dbc611a4ef9df673c26f50e7280a3ba8ed2f99c05b0bb1b868a77d7e9aca226d428e WHIRLPOOL b007a0761eca9bf2ededa866ee981323125a1849481ec00faca9a0bde13f2cde734a9beacdbcc97a55d174539554099f95cf98261ddc4c69f13c78b38e98217c
 MISC metadata.xml 329 SHA256 f0ae08a64aa32a07486e744ce11ac5448770b7320454015bcd065e312fcb5e9c SHA512 11e4eaf25633c5979e5243350bdf2ddc6d9dca06ab54ec38359591f1d002ea2a224e53b3e6c4ac53b5b2e795a87769fdbd97c547b008272e0a1491141f422e5d WHIRLPOOL ab2c1cb3d9aff1f757b49633f94d4b98da4b83dadab12ab8d869f9e1f6763b3125010147472e58e910e7fc42da262dbd69a1bf3939f3720a79ab4329184b4c35

dev-vcs/gitlab-ci-multi-runner/files/gitlab-ci-multi-runner-9.3.0.init

@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+# Copyright 2015-2017 Nicolas Heine
+
+depend() {
+        after sshd
+        need net
+        need localmount
+}
+
+start() {
+        ebegin "Starting gitlab-ci-multi-runner"
+        checkpath -d /var/run
+        checkpath -f -o @USER@ -m640 "${LOGFILE}"
+        start-stop-daemon --start -b -u @USER@ --chdir @HOME@ --pidfile /var/run/gitlab-ci-multi-runner.pid -1 "${LOGFILE}" -2 "${LOGFILE}" --make-pidfile \
+                --exec /usr/bin/gitlab-ci-multi-runner -- run --config /etc/gitlab-runner/config.toml
+        eend $?
+}
+
+stop() {
+        ebegin "Stopping gitlab-ci-multi-runner"
+        start-stop-daemon --stop --pidfile /var/run/gitlab-ci-multi-runner.pid
+        eend $?
+}

dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-9.3.0-r1.ebuild

@@ -63,7 +63,7 @@ src_install() {
 	dodoc src/${EGO_PN}/README.md src/${EGO_PN}/CHANGELOG.md
 
 	# rc script
-	local rcscript="${PN}.init"
+	local rcscript="${PN}-9.3.0.init"
 
 	cp "${FILESDIR}/${rcscript}" "${T}" || die
 	sed -i \

dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-9.4.1.ebuild

@@ -67,7 +67,7 @@ src_install() {
 	dodoc src/${EGO_PN}/README.md src/${EGO_PN}/CHANGELOG.md
 
 	# rc script
-	local rcscript="${PN}.init"
+	local rcscript="${PN}-9.3.0.init"
 
 	cp "${FILESDIR}/${rcscript}" "${T}" || die
 	sed -i \