[arch-commits] Commit in jenkins-ci/trunk (PKGBUILD jenkins.install)

[Alexander Rødseth]

    Date: Thursday, August 15, 2013 @ 20:33:42
  Author: arodseth
Revision: 95700

upgpkg: jenkins-ci 1.509.2-2

Modified:
  jenkins-ci/trunk/PKGBUILD
  jenkins-ci/trunk/jenkins.install

-----------------+
 PKGBUILD        |    2 +-
 jenkins.install |   10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-08-15 18:33:00 UTC (rev 95699)
+++ PKGBUILD	2013-08-15 18:33:42 UTC (rev 95700)
@@ -15,7 +15,7 @@
 conflicts=('jenkins')
 replaces=('jenkins')
 backup=('etc/conf.d/jenkins')
-install="$pkgname.install"
+install=jenkins.install
 noextract=('jenkins.war')
 source=("http://mirrors.jenkins-ci.org/war-stable/latest/jenkins.war"
         'jenkins.conf'

Modified: jenkins.install
===================================================================
--- jenkins.install	2013-08-15 18:33:00 UTC (rev 95699)
+++ jenkins.install	2013-08-15 18:33:42 UTC (rev 95700)
@@ -14,16 +14,17 @@
   getent passwd "$_service_username" > /dev/null || /usr/sbin/useradd \
     --system --user-group --home-dir "$_service_home_dir" --create-home \
     --shell '/bin/bash' --skel /dev/null "$_service_username" &> /dev/null
-  [ -n "$_service_tmpfiles_conf" ] && \
-    systemd-tmpfiles --create "$_service_tmpfiles_conf"
+  [ -n "$_service_tmpfiles_conf" ] && /usr/bin/systemd-tmpfiles \
+    --create "$_service_tmpfiles_conf" 2>/dev/null
   mkdir -p /var/lib/jenkins
   chown jenkins:jenkins /var/lib/jenkins
   echo 'This installation of Jenkins uses port 8090 by default.'
+  return 0
 }
 
 post_upgrade() {
   [ -n "$_service_tmpfiles_conf" ] && systemd-tmpfiles \
-    --create "$_service_tmpfiles_conf"
+    --create "$_service_tmpfiles_conf" 2>/dev/null
   mkdir -p /var/lib/jenkins
   chown jenkins:jenkins /var/lib/jenkins
   _is_systemd_service_enabled && cat <<EOF
@@ -31,6 +32,7 @@
   sudo systemctl --system daemon-reload
   sudo systemctl restart $_service_name
 EOF
+  return 0
 }
 
 pre_remove() {
@@ -44,7 +46,7 @@
 
 post_remove() {
   getent passwd "$_service_username" > /dev/null && \
-    /usr/sbin/userdel "$_service_username" &>/dev/null
+    /usr/sbin/userdel "$_service_username" 2>/dev/null
   for dir in "$_service_home_dir"; do
     [ -n "$dir" -a -d "$dir" ] && \
       echo "=> directory $dir needs to be removed manually"