cure-fpm 1.3.3b → 1.6.0b

data/templates/sh.erb

@@ -27,6 +27,7 @@ function main() {
       wait_for_others
       kill_others
       set_owner
+      pre_install
       unpack_payload
 
       if [ "$UNPACK_ONLY" == "1" ] ; then
@@ -61,8 +62,9 @@ function slug_already_current(){
         if [ "$FORCE" == "1" ] ; then
         log "Force was specified. Proceeding with install after renaming live directory to allow running service to shutdown correctly."
             local real_dir=$(readlink ${INSTALL_ROOT}/current)
-            if [ -f ${real_dir}.old ] ; then
+            if [ -e ${real_dir}.old ] ; then
                 # remove that .old directory, if needed
+                log "removing existing .old version of release"
                 rm -rf ${real_dir}.old
             fi
             mv ${real_dir} ${real_dir}.old
@@ -173,6 +175,14 @@ function set_owner(){
     log "Installing as user $OWNER"
 }
 
+function pre_install() {
+    # for rationale on the `:`, see #871
+    :
+<% if script?(:before_install) -%>
+<%=    script(:before_install) %>
+<% end %>
+}
+
 function unpack_payload(){
     if [ "$FORCE" == "1" ] || [ ! "$(ls -A $INSTALL_DIR)" ] ; then
         log "Unpacking payload . . ."
@@ -187,6 +197,7 @@ function unpack_payload(){
 function run_post_install(){
     local AFTER_INSTALL=$INSTALL_DIR/.fpm/after_install
     if [ -r $AFTER_INSTALL ] ; then
+        set_post_install_vars
         chmod +x $AFTER_INSTALL
         log "Running post install script"
         output=$($AFTER_INSTALL 2>&1)
@@ -197,11 +208,23 @@ function run_post_install(){
     return 0
 }
 
+function set_post_install_vars(){
+    # for rationale on the `:`, see #871
+    :
+    <% if respond_to?(:package_metadata)%>
+      <% package_metadata_hash = JSON.parse(package_metadata)%>
+      <% package_metadata_hash.each do |k,v| %>
+        <%= "export #{k.upcase}='#{v}'; "%>
+      <% end %>
+    <% end %>
+}
+
 function create_symlinks(){
     [ -n "$USE_FLAT_RELEASE_DIRECTORY" ] && return
 
     export CURRENT_DIR="$INSTALL_ROOT/current"
-    if [ -e "$CURRENT_DIR" ] ; then
+    if [ -e "$CURRENT_DIR" ] || [ -h "$CURRENT_DIR" ] ; then
+        log "Removing current symlink"
         OLD_CURRENT_TARGET=$(readlink $CURRENT_DIR)
         rm "$CURRENT_DIR"
     fi
@@ -242,6 +265,12 @@ function clean_out_old_releases(){
     fi
 }
 
+function print_package_metadata(){
+    local metadata_line=$(grep -a -n -m1 '__METADATA__$' $0 | sed 's/:.*//')
+    local archive_line=$(grep -a -n -m1 '__ARCHIVE__$' $0 | sed 's/:.*//')
+    sed -n "$((metadata_line + 1)),$((archive_line - 1)) p" $0
+}
+
 function print_usage(){
     echo "Usage: `basename $0` [options]"
     echo "Install this package"
@@ -275,7 +304,7 @@ function log(){
 }
 
 function parse_args() {
-    args=`getopt i:o:rfuyvh $*`
+    args=`getopt mi:o:rfuyvh $*`
 
     if [ $? != 0 ] ; then
         print_usage
@@ -286,6 +315,10 @@ function parse_args() {
     do
         case "$i"
             in
+            -m)
+                print_package_metadata
+                exit 0
+                shift;;
             -r)
                 USE_FLAT_RELEASE_DIRECTORY=1
                 shift;;
@@ -331,4 +364,6 @@ main
 save_environment $(fpm_metadata_file)
 exit 0
 
+__METADATA__
+<%= package_metadata if respond_to?(:package_metadata) %>
 __ARCHIVE__

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cure-fpm
 version: !ruby/object:Gem::Version
-  version: 1.3.3b
+  version: 1.6.0b
 platform: ruby
 authors:
 - Ward Vandewege
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-16 00:00:00.000000000 Z
+date: 2016-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: 0.0.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: 0.0.10
 - !ruby/object:Gem::Dependency
   name: clamp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: childprocess
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10'
+- !ruby/object:Gem::Dependency
+  name: archive-tar-minitar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-xz
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pleaserun
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.24
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.24
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -182,15 +238,20 @@ files:
 - lib/fpm/errors.rb
 - lib/fpm/namespace.rb
 - lib/fpm/package.rb
+- lib/fpm/package/apk.rb
 - lib/fpm/package/cpan.rb
 - lib/fpm/package/deb.rb
 - lib/fpm/package/dir.rb
 - lib/fpm/package/empty.rb
+- lib/fpm/package/freebsd.rb
 - lib/fpm/package/gem.rb
 - lib/fpm/package/npm.rb
 - lib/fpm/package/osxpkg.rb
+- lib/fpm/package/p5p.rb
+- lib/fpm/package/pacman.rb
 - lib/fpm/package/pear.rb
 - lib/fpm/package/pkgin.rb
+- lib/fpm/package/pleaserun.rb
 - lib/fpm/package/puppet.rb
 - lib/fpm/package/pyfpm/__init__.py
 - lib/fpm/package/pyfpm/__init__.pyc
@@ -201,8 +262,11 @@ files:
 - lib/fpm/package/sh.rb
 - lib/fpm/package/solaris.rb
 - lib/fpm/package/tar.rb
+- lib/fpm/package/virtualenv.rb
 - lib/fpm/package/zip.rb
+- lib/fpm/rake_task.rb
 - lib/fpm/util.rb
+- lib/fpm/util/tar_writer.rb
 - lib/fpm/version.rb
 - templates/deb.erb
 - templates/deb/changelog.erb
@@ -212,6 +276,14 @@ files:
 - templates/deb/preinst_upgrade.sh.erb
 - templates/deb/prerm_upgrade.sh.erb
 - templates/osxpkg.erb
+- templates/p5p_metadata.erb
+- templates/pacman.erb
+- templates/pacman/INSTALL.erb
+- templates/pleaserun/generate-cleanup.sh
+- templates/pleaserun/install-path.sh
+- templates/pleaserun/install.sh
+- templates/pleaserun/scripts/after-install.sh
+- templates/pleaserun/scripts/before-remove.sh
 - templates/puppet/package.pp.erb
 - templates/puppet/package/remove.pp.erb
 - templates/rpm.erb
@@ -239,7 +311,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: fpm - package building and mangling