cure-fpm 1.3.3b → 1.6.0b

data/lib/fpm/version.rb

@@ -1,3 +1,3 @@
 module FPM
-  VERSION = "1.3.3b"
+  VERSION = "1.6.0b"
 end

data/templates/deb/postinst_upgrade.sh.erb

@@ -1,18 +1,50 @@
+#!/bin/sh
 after_upgrade() {
+<%# Making sure that at least one command is in the function -%>
+<%# avoids a lot of potential errors, including the case that -%>
+<%# the script is non-empty, but just whitespace and/or comments -%>
+    :
 <% if script?(:after_upgrade) -%>
 <%=  script(:after_upgrade) %>
 <% end -%>
+
+<% if attributes[:deb_systemd] -%>
+systemctl --system daemon-reload >/dev/null || true
+if ! systemctl is-enabled <%= attributes[:deb_systemd] %> >/dev/null 
+then
+    systemctl enable <%= attributes[:deb_systemd] %> >/dev/null || true
+    systemctl start <%= attributes[:deb_systemd] %> >/dev/null || true
+<% if attributes[:deb_systemd_restart_after_upgrade?] -%>
+else
+    systemctl restart <%= attributes[:deb_systemd] %> >/dev/null || true
+<% end -%>
+fi
+<% end -%>
 }
 
 after_install() {
+<%# Making sure that at least one command is in the function -%>
+<%# avoids a lot of potential errors, including the case that -%>
+<%# the script is non-empty, but just whitespace and/or comments -%>
+    :
 <% if script?(:after_install) -%>
 <%=  script(:after_install) %>
 <% end -%>
+
+<% if attributes[:deb_systemd] -%>
+systemctl --system daemon-reload >/dev/null || true
+systemctl enable <%= attributes[:deb_systemd] %> >/dev/null || true
+systemctl start <%= attributes[:deb_systemd] %> >/dev/null || true
+<% end -%>
 }
 
-if [ "${1}" = "configure" -a -z "${2}" ]
+if [ "${1}" = "configure" -a -z "${2}" ] || \
+   [ "${1}" = "abort-remove" ]
 then
     # "after install" here
+    # "abort-remove" happens when the pre-removal script failed.
+    #   In that case, this script, which should be idemptoent, is run
+    #   to ensure a clean roll-back of the removal.
     after_install
 elif [ "${1}" = "configure" -a -n "${2}" ]
 then
@@ -28,4 +60,3 @@ then
     echo "Failed to install before the post-installation script was run." >&2
     exit 1
 fi
-

data/templates/deb/postrm_upgrade.sh.erb

@@ -1,16 +1,25 @@
+#!/bin/sh
 after_remove() {
+<%# Making sure that at least one command is in the function -%>
+<%# avoids a lot of potential errors, including the case that -%>
+<%# the script is non-empty, but just whitespace and/or comments -%>
+    :
 <% if script?(:after_remove) -%>
 <%=  script(:after_remove) %>
 <% end -%>
 }
 
 dummy() {
+    :
 }
 
 
-if [ "${1}" = "remove" ]
+if [ "${1}" = "remove" -o "${1}" = "abort-install" ]
 then
     # "after remove" goes here
+    # "abort-install" happens when the pre-installation script failed.
+    #   In that case, this script, which should be idemptoent, is run
+    #   to ensure a clean roll-back of the installation.
     after_remove
 elif [ "${1}" = "purge" -a -z "${2}" ]
 then

data/templates/deb/preinst_upgrade.sh.erb

@@ -1,10 +1,19 @@
+#!/bin/sh
 before_upgrade() {
+<%# Making sure that at least one command is in the function -%>
+<%# avoids a lot of potential errors, including the case that -%>
+<%# the script is non-empty, but just whitespace and/or comments -%>
+    :
 <% if script?(:before_upgrade) -%>
 <%=  script(:before_upgrade) %>
 <% end -%>
 }
 
 before_install() {
+<%# Making sure that at least one command is in the function -%>
+<%# avoids a lot of potential errors, including the case that -%>
+<%# the script is non-empty, but just whitespace and/or comments -%>
+    :
 <% if script?(:before_install) -%>
 <%=  script(:before_install) %>
 <% end -%>
@@ -16,7 +25,7 @@ then
 elif [ "${1}" = "upgrade" -a -n "${2}" ]
 then
     upgradeFromVersion="${2}"
-    before_upgrade "${2}"
+    before_upgrade "${upgradeFromVersion}"
 elif [ "${1}" = "install" -a -n "${2}" ]
 then
     upgradeFromVersion="${2}"
@@ -24,7 +33,7 @@ then
     # and a new version is installed.
     # Looks a _lot_ like an upgrade case, I say we just execute the
     # same "before upgrade" script as in the previous case
-    before_upgrade "${2}"
+    before_upgrade "${upgradeFromVersion}"
 elif echo "${1}" | grep -E -q '(fail|abort)'
 then
     echo "Failed to install before the pre-installation script was run." >&2

data/templates/deb/prerm_upgrade.sh.erb

@@ -1,10 +1,23 @@
+#!/bin/sh
 before_remove() {
+<%# Making sure that at least one command is in the function -%>
+<%# avoids a lot of potential errors, including the case that -%>
+<%# the script is non-empty, but just whitespace and/or comments -%>
+    :
 <% if script?(:before_remove) -%>
 <%=  script(:before_remove) %>
 <% end -%>
+
+<%# Removing the systemd service-%>
+<% if attributes[:deb_systemd] -%>
+systemctl stop <%= attributes[:deb_systemd] %> >/dev/null || true
+systemctl disable <%= attributes[:deb_systemd] %> >/dev/null || true
+systemctl --system daemon-reload >/dev/null || true
+<% end -%>
 }
 
 dummy() {
+    :
 }
 
 if [ "${1}" = "remove" -a -z "${2}" ]
@@ -13,13 +26,12 @@ then
     before_remove
 elif [ "${1}" = "upgrade" ]
 then
-    upgradeVersionTo="${2}"
     # Executed before the old version is removed
     # upon upgrade.
     # We should generally not do anything here. The newly installed package
     # should do the upgrade, not the uninstalled one, since it can't anticipate
     # what new things it will have to do to upgrade for the new version.
-    dummy "${2}"
+    dummy
 elif echo "${1}" | grep -E -q "(fail|abort)"
 then
     echo "Failed to install before the pre-removal script was run." >&2

data/templates/p5p_metadata.erb

@@ -0,0 +1,12 @@
+set name=pkg.fmri value="<%=@name%>@<%=@version%>"
+set name=pkg.summary value="<%=@description%>"
+set name=pkg.human-version value="<%=@version%>"
+set name=pkg.description value="<%=@description%>"
+set name=info.classification value="org.opensolaris.category.2008:<%=@category%>"
+set name=variant.opensolaris.zone <%= attributes[:p5p_zonetype] %>
+set name=variant.arch value=<%=@architecture%>
+<transform file dir -> set owner <%= attributes[:p5p_user] %>>
+<transform file dir -> set group <%= attributes[:p5p_group] %>>
+<transform dir path=opt$->drop>
+<transform dir path=etc$->drop>
+<transform dir path=usr(?:|/bin)$->drop>

data/templates/pacman.erb

@@ -0,0 +1,47 @@
+# Generated by fpm
+# Hello packaging friend!
+#
+# If you find yourself using this 'fpm --edit' feature frequently, it is
+# a sign that fpm is missing a feature! I welcome your feature requests!
+# Please visit the following URL and ask for a feature that helps you never
+# need to edit this file again! :)
+#   https://github.com/jordansissel/fpm/issues
+# ------------------------------------------------------------------------
+#
+pkgname = <%= name %>
+<% if !epoch.nil? -%>
+pkgver = <%= epoch %>:<%= version %>-<%= iteration %>
+<% else -%>
+pkgver = <%= version %>-<%= iteration %>
+<% end -%>
+pkgdesc = <%= description %>
+<% if !url.nil? and !url.empty? -%>
+url = <%= url %>
+<% else -%>
+url = http://nourlgiven.example.com/
+<% end -%>
+builddate = <%= builddate %>
+packager = <%= maintainer %>
+size = <%= size %>
+arch = <%= architecture %>
+license = <%= license %>
+<% replaces.each do |repl| -%>
+replaces = <%= repl %>
+<% end -%>
+group = <%= category %>
+<% conflicts.each do |confl| -%>
+conflict = <%= confl %>
+<% end -%>
+<% provides.each do |prov| -%>
+provides = <%= prov %>
+<% end -%>
+<% config_files.each do |conf| -%>
+<%   conf.gsub(/^\/+/, "") -%>
+backup = <%= conf %>
+<% end -%>
+<% dependencies.each do |req| -%>
+depend = <%= req %>
+<% end -%>
+<% attributes.fetch(:pacman_opt_depends, []).each do |opt| -%>
+optdepend = <%= opt %>
+<% end -%>

data/templates/pacman/INSTALL.erb

@@ -0,0 +1,41 @@
+<%# In each function, a `:` is the first command. -%>
+<%# This makes sure that at least one command is in the function -%>
+<%# This avoids a lot of potential errors, including the case that -%>
+<%# the script is non-empty, but just whitespace and/or comments -%>
+<%# see issue #875 for more details -%>
+<% if script?(:before_install) -%>
+pre_install() {
+    :
+<%= script(:before_install) %>
+}
+<% end -%>
+<% if script?(:after_install) -%>
+post_install() {
+    :
+<%= script(:after_install) %>
+}
+<% end -%>
+<% if script?(:before_upgrade) -%>
+pre_upgrade() {
+    :
+<%= script(:before_upgrade) %>
+}
+<% end -%>
+<% if script?(:after_upgrade) -%>
+post_upgrade() {
+    :
+<%= script(:after_upgrade) %>
+}
+<% end -%>
+<% if script?(:before_remove) -%>
+pre_remove() {
+    :
+<%= script(:before_remove) %>
+}
+<% end -%>
+<% if script?(:after_remove) -%>
+post_remove() {
+    :
+<%= script(:after_remove) %>
+}
+<% end -%>

data/templates/pleaserun/generate-cleanup.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+show_cleanup_step() {
+  d="${1##.}"
+  if [ ! -z "$d" ] ; then 
+    if [ -d "$1" -a ! -d "$d" ] ; then 
+      echo "rmdir \"$d\""
+    fi
+    if [ -f "$1" ] ; then 
+      echo "rm \"$d\""
+    fi
+  fi
+}
+
+for i in "$@" ; do
+  show_cleanup_step "$i"
+done

data/templates/pleaserun/install-path.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+install_path() {
+  d="${1##.}"
+  if [ ! -z "$d" ] ; then 
+    if [ -d "$1" -a ! -d "$d" ] ; then 
+      mkdir "$d"
+    fi
+    if [ -f "$1" ] ; then 
+      cp -p "$1" "$d"
+    fi
+  fi
+}
+
+for i in "$@" ; do
+  install_path "$i"
+done

data/templates/pleaserun/install.sh

@@ -0,0 +1,117 @@
+#!/bin/sh
+
+source="<%= attributes[:prefix] %>"
+
+cleanup_script="$source/cleanup.sh"
+
+silent() {
+  "$@" > /dev/null 2>&1
+}
+
+install_files() {
+  # TODO(sissel): Need to know what prefix the files exist at
+  platform="$1"
+  version="$(version_${platform})"
+
+  (
+    # TODO(sissel): Should I just rely on rsync for this stuff?
+    cd "${source}/${platform}/${version}/files/" || exit 1
+
+    # Write a cleanup script
+    find . -print0 | xargs -r0 -n1 "$source/generate-cleanup.sh" > "$cleanup_script"
+
+    # Actually do the installation
+    find . -print0 | xargs -r0 -n1 "$source/install-path.sh"
+  )
+}
+
+install_actions() {
+  # TODO(sissel): Need to know what prefix the files exist at
+  platform="$1"
+  version="$(version_${platform})"
+  
+
+  actions="${source}/${platform}/${version}/install_actions.sh"
+  if [ -f "$actions" ] ; then
+    . "$actions"
+  fi
+}
+
+version_systemd() {
+  # Treat all systemd versions the same
+  echo default
+}
+
+version_launchd() {
+  # Treat all launchd versions the same
+  echo 10.9
+}
+
+version_upstart() {
+  # Treat all upstart versions the same
+  # TODO(sissel): Upstart 0.6.5 needs to be handled specially.
+  version="$(initctl --version | head -1 | tr -d '()' | awk '{print $NF}')"
+
+  case $version in
+    0.6.5) echo $version ;;
+    *) echo "1.5" ;; # default modern assumption
+  esac
+}
+
+version_sysv() {
+  # TODO(sissel): Once pleaserun supports multiple sysv implementations, maybe
+  # we inspect the OS to find out what we should target.
+  echo lsb-3.1
+}
+
+has_systemd() {
+  # Some OS vendors put systemd in ... different places ...
+  [ -d "/lib/systemd/system/" -o -d "/usr/lib/systemd/system" ] && silent which systemctl
+}
+
+has_upstart() {
+  [ -d "/etc/init" ] && silent which initctl
+}
+
+has_sysv() {
+  [ -d "/etc/init.d" ] 
+}
+
+#has_freebsd_rcng() {
+  #[ -d "/etc/rc.d" ] && silent which rcorder
+#}
+
+has_daemontools() {
+  [ -d "/service" ] && silent which sv
+}
+
+has_launchd() { 
+  [ -d "/Library/LaunchDaemons" ] && silent which launchtl
+}
+
+install_help() {
+  case $platform in
+    systemd) echo "To start this service, use: systemctl start <%= attributes[:pleaserun_name] %>" ;;
+    upstart) echo "To start this service, use: initctl start <%= attributes[:pleaserun_name] %>" ;;
+    launchd) echo "To start this service, use: launchctl start <%= attributes[:pleaserun_name] %>" ;;
+    sysv) echo "To start this service, use: /etc/init.d/<%= attributes[:pleaserun_name] %> start" ;;
+  esac
+}
+
+platforms="systemd upstart launchd sysv"
+installed=0
+for platform in $platforms ; do
+  if has_$platform ; then
+    version="$(version_$platform)"
+    echo "Platform $platform ($version) detected. Installing service."
+    install_files $platform
+    install_actions $platform
+    install_help $platform
+    installed=1
+    break
+  fi
+done
+
+if [ "$installed" -eq 0 ] ; then
+  echo "Failed to detect any service platform, so no service was installed. Files are available in ${source} if you need them."
+fi

data/templates/pleaserun/scripts/after-install.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+source="<%= attributes[:prefix] %>"
+exec sh "$source/install.sh"

data/templates/pleaserun/scripts/before-remove.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+source="<%= attributes[:prefix] %>"
+
+if [ -f "$source/cleanup.sh" ] ; then
+  echo "Running cleanup to remove service for package <%= attributes[:name] %>"
+  set -e
+  sh "$source/cleanup.sh"
+
+  # Remove the script also since the package installation generated it.
+  rm "$source/cleanup.sh"
+fi

data/templates/rpm.erb

@@ -17,8 +17,11 @@
 # Disable checking for unpackaged files ?
 #%undefine __check_files
 
-# Use <%= attributes[:rpm_digest] %> file digest method
+# Use <%= attributes[:rpm_digest] %> file digest method. 
+# The first macro is the one used in RPM v4.9.1.1
 %define _binary_filedigest_algorithm <%= digest_algorithm %>
+# This is the macro I find on OSX when Homebrew provides rpmbuild (rpm v5.4.14)
+%define _build_binary_file_digest_algo <%= digest_algorithm %>
 
 # Use <%= attributes[:rpm_compression] %> payload compression
 %define _binary_payload <%= payload_compression %> 
@@ -38,9 +41,9 @@ Version: <%= version %>
 <% if epoch -%>
 Epoch: <%= epoch %>
 <% end -%>
-Release: <%= iteration or 1 %>
+Release: <%= iteration or 1 %><%= "%{?dist}" if attributes[:rpm_dist] %>
 <%# use the first line of the description as the summary -%>
-Summary: <%= description.split("\n").first.empty? ? "_" :  description.split("\n").first %>
+Summary: <%= summary %>
 <% if !attributes[:rpm_autoreqprov?] -%>
 AutoReqProv: no
 <% else -%>
@@ -80,6 +83,9 @@ Packager: <%= maintainer %>
 <% dependencies.each do |req| -%>
 Requires: <%= req %>
 <% end -%>
+<% (attributes[:rpm_tags] or []).each do |tag| -%>
+<%= tag %>
+<% end -%>
 <% end -%>
 <% provides.each do |prov| -%>
 Provides: <%= prov %>
@@ -120,42 +126,60 @@ Obsoletes: <%= repl %>
 <%   if script?(:before_upgrade) or script?(:before_install) -%>
 %pre
 upgrade() {
+<%# Making sure that at least one command is in the function -%>
+<%# avoids a lot of potential errors, including the case that -%>
+<%# the script is non-empty, but just whitespace and/or comments -%>
+    :
 <%     if script?(:before_upgrade) -%>
 <%=      script(:before_upgrade) %>
 <%     end -%>
 }
 install() {
+<%# Making sure that at least one command is in the function -%>
+<%# avoids a lot of potential errors, including the case that -%>
+<%# the script is non-empty, but just whitespace and/or comments -%>
+    :
 <%     if script?(:before_install) -%>
 <%=      script(:before_install) %>
 <%     end -%>
 }
 if [ "${1}" -eq 1 ]
 then
-    install
     # "before install" goes here
+    install
 elif [ "${1}" -gt 1 ]
 then
+    # "before upgrade" goes here
     upgrade
 fi
 <%   end -%>
 <%   if script?(:after_upgrade) or script?(:after_install) -%>
-%pre
+%post
 upgrade() {
+<%# Making sure that at least one command is in the function -%>
+<%# avoids a lot of potential errors, including the case that -%>
+<%# the script is non-empty, but just whitespace and/or comments -%>
+    :
 <%     if script?(:after_upgrade) -%>
 <%=      script(:after_upgrade) %>
 <%     end -%>
 }
 install() {
+<%# Making sure that at least one command is in the function -%>
+<%# avoids a lot of potential errors, including the case that -%>
+<%# the script is non-empty, but just whitespace and/or comments -%>
+    :
 <%     if script?(:after_install) -%>
 <%=      script(:after_install) %>
 <%     end -%>
 }
 if [ "${1}" -eq 1 ]
 then
+    # "after install" goes here
     install
-    # "before install" goes here
 elif [ "${1}" -gt 1 ]
 then
+    # "after upgrade" goes here
     upgrade
 fi
 <%   end -%>
@@ -163,6 +187,10 @@ fi
 %preun
 if [ "${1}" -eq 0 ]
 then
+<%# Making sure that at least one command is in the function -%>
+<%# avoids a lot of potential errors, including the case that -%>
+<%# the script is non-empty, but just whitespace and/or comments -%>
+    :
 <%=    script(:before_remove) %>
 fi
 <%   end -%>
@@ -170,6 +198,10 @@ fi
 %postun
 if [ "${1}" -eq 0 ]
 then
+<%# Making sure that at least one command is in the function -%>
+<%# avoids a lot of potential errors, including the case that -%>
+<%# the script is non-empty, but just whitespace and/or comments -%>
+    :
 <%=    script(:after_remove) %>
 fi
 <%   end -%>