Commit 98c461c8 authored by Marco Mariani's avatar Marco Mariani

use cp.recipe.cmd instead of plone.recipe.command for bash compatibility

with .bashrc
parent 661e13d3
No related merge requests found
...@@ -271,14 +271,14 @@ zimbra-home = ${buildout:directory}/zimbra-home ...@@ -271,14 +271,14 @@ zimbra-home = ${buildout:directory}/zimbra-home
[zimbra-unpack-store] [zimbra-unpack-store]
# extract binaries and scripts from the .deb packages # extract binaries and scripts from the .deb packages
# export ZIMBRA_INSTALLED_PKGS="zimbra-core zimbra-store" recipe = cp.recipe.cmd
recipe = plone.recipe.command # required to source .bashrc
stop-on-error = True shell = /bin/bash
PACKAGE_LIST = zimbra-core zimbra-store PACKAGE_LIST = zimbra-core zimbra-store
ZIMBRA_HOME = ${environment:ZIMBRA_HOME} ZIMBRA_HOME = ${environment:ZIMBRA_HOME}
PACKAGES = /home/marco/zbuild/amd64 PACKAGES = /home/marco/zbuild/amd64
update-command = ${:command} update_cmd = ${:install_cmd}
command = install_cmd =
rm -rf ${:ZIMBRA_HOME} rm -rf ${:ZIMBRA_HOME}
mkdir ${:ZIMBRA_HOME} mkdir ${:ZIMBRA_HOME}
cd ${:ZIMBRA_HOME} cd ${:ZIMBRA_HOME}
...@@ -307,19 +307,21 @@ command = ...@@ -307,19 +307,21 @@ command =
chmod 1777 data/tmp chmod 1777 data/tmp
mkdir backup ssl .ssh zmstat mkdir backup ssl .ssh zmstat
. ${:ZIMBRA_HOME}/.bashrc
ZIMBRA_INSTALLED_PKGS="${:PACKAGE_LIST}" ${:ZIMBRA_HOME}/libexec/zmsetup.pl ZIMBRA_INSTALLED_PKGS="${:PACKAGE_LIST}" ${:ZIMBRA_HOME}/libexec/zmsetup.pl
[zimbra-unpack-ldap] [zimbra-unpack-ldap]
# extract binaries and scripts from the .deb packages # extract binaries and scripts from the .deb packages
recipe = plone.recipe.command recipe = cp.recipe.cmd
stop-on-error = True # required to source .bashrc
shell = /bin/bash
PACKAGE_LIST = zimbra-core zimbra-ldap PACKAGE_LIST = zimbra-core zimbra-ldap
ZIMBRA_HOME = ${environment:ZIMBRA_HOME} ZIMBRA_HOME = ${environment:ZIMBRA_HOME}
PACKAGES = /home/marco/zbuild/amd64 PACKAGES = /home/marco/zbuild/amd64
update-command = ${:command} update_cmd = ${:install_cmd}
command = install_cmd =
rm -rf ${:ZIMBRA_HOME} rm -rf ${:ZIMBRA_HOME}
mkdir ${:ZIMBRA_HOME} mkdir ${:ZIMBRA_HOME}
cd ${:ZIMBRA_HOME} cd ${:ZIMBRA_HOME}
...@@ -352,19 +354,21 @@ command = ...@@ -352,19 +354,21 @@ command =
# clear credential cache to spot commands in zmsetup.pl that would require sudo # clear credential cache to spot commands in zmsetup.pl that would require sudo
sudo -k sudo -k
. ${:ZIMBRA_HOME}/.bashrc
ZIMBRA_INSTALLED_PKGS="${:PACKAGE_LIST}" ${:ZIMBRA_HOME}/libexec/zmsetup.pl ZIMBRA_INSTALLED_PKGS="${:PACKAGE_LIST}" ${:ZIMBRA_HOME}/libexec/zmsetup.pl
[zimbra-unpack-mta] [zimbra-unpack-mta]
# extract binaries and scripts from the .deb packages # extract binaries and scripts from the .deb packages
recipe = plone.recipe.command recipe = cp.recipe.cmd
stop-on-error = True # required to source .bashrc
shell = /bin/bash
PACKAGE_LIST = zimbra-core zimbra-mta PACKAGE_LIST = zimbra-core zimbra-mta
ZIMBRA_HOME = ${environment:ZIMBRA_HOME} ZIMBRA_HOME = ${environment:ZIMBRA_HOME}
PACKAGES = /home/marco/zbuild/amd64 PACKAGES = /home/marco/zbuild/amd64
update-command = ${:command} update_cmd = ${:install_cmd}
command = install_cmd =
rm -rf ${:ZIMBRA_HOME} rm -rf ${:ZIMBRA_HOME}
mkdir ${:ZIMBRA_HOME} mkdir ${:ZIMBRA_HOME}
cd ${:ZIMBRA_HOME} cd ${:ZIMBRA_HOME}
...@@ -402,6 +406,7 @@ command = ...@@ -402,6 +406,7 @@ command =
mkdir -p data/amavisd/quarantine mkdir -p data/amavisd/quarantine
mkdir -p data/clamav/db mkdir -p data/clamav/db
mkdir -p data/postfix/spool/pid mkdir -p data/postfix/spool/pid
mkdir -p conf/sa
mkdir -p data/tmp mkdir -p data/tmp
chmod 1777 data/tmp chmod 1777 data/tmp
...@@ -411,6 +416,7 @@ command = ...@@ -411,6 +416,7 @@ command =
# clear credential cache to spot commands in zmsetup.pl that would require sudo # clear credential cache to spot commands in zmsetup.pl that would require sudo
sudo -k sudo -k
. ${:ZIMBRA_HOME}/.bashrc
ZIMBRA_INSTALLED_PKGS="${:PACKAGE_LIST}" ${:ZIMBRA_HOME}/libexec/zmsetup.pl ZIMBRA_INSTALLED_PKGS="${:PACKAGE_LIST}" ${:ZIMBRA_HOME}/libexec/zmsetup.pl
...@@ -426,13 +432,14 @@ command = ...@@ -426,13 +432,14 @@ command =
[zimbra-unpack-all] [zimbra-unpack-all]
# extract binaries and scripts from the .deb packages # extract binaries and scripts from the .deb packages
recipe = plone.recipe.command recipe = cp.recipe.cmd
stop-on-error = True # required to source .bashrc
shell = /bin/bash
PACKAGE_LIST = zimbra-core zimbra-ldap zimbra-mta zimbra-store PACKAGE_LIST = zimbra-core zimbra-ldap zimbra-mta zimbra-store
ZIMBRA_HOME = ${environment:ZIMBRA_HOME} ZIMBRA_HOME = ${environment:ZIMBRA_HOME}
PACKAGES = /home/marco/zbuild/amd64 PACKAGES = /home/marco/zbuild/amd64
update-command = ${:command} update_cmd = ${:install_cmd}
command = install_cmd =
rm -rf ${:ZIMBRA_HOME} rm -rf ${:ZIMBRA_HOME}
mkdir ${:ZIMBRA_HOME} mkdir ${:ZIMBRA_HOME}
cd ${:ZIMBRA_HOME} cd ${:ZIMBRA_HOME}
...@@ -475,6 +482,7 @@ command = ...@@ -475,6 +482,7 @@ command =
mkdir -p data/amavisd/quarantine mkdir -p data/amavisd/quarantine
mkdir -p data/clamav/db mkdir -p data/clamav/db
mkdir -p data/postfix/spool/pid mkdir -p data/postfix/spool/pid
mkdir -p conf/sa
mkdir -p data/tmp mkdir -p data/tmp
chmod 1777 data/tmp chmod 1777 data/tmp
...@@ -486,5 +494,6 @@ command = ...@@ -486,5 +494,6 @@ command =
# clear credential cache to spot commands in zmsetup.pl that would require sudo # clear credential cache to spot commands in zmsetup.pl that would require sudo
sudo -k sudo -k
. ${:ZIMBRA_HOME}/.bashrc
ZIMBRA_INSTALLED_PKGS="${:PACKAGE_LIST}" ${:ZIMBRA_HOME}/libexec/zmsetup.pl ZIMBRA_INSTALLED_PKGS="${:PACKAGE_LIST}" ${:ZIMBRA_HOME}/libexec/zmsetup.pl
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment