[Fusionforge-commits] FusionForge branch GUM updated. c1f7086e75a8683f3fc0720a3b2a48f3ad1240b0
Sylvain Beucler
beuc-inria at fusionforge.org
Fri Aug 22 10:24:39 CEST 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, GUM has been updated
via c1f7086e75a8683f3fc0720a3b2a48f3ad1240b0 (commit)
via f53909ae0b78e98140c09df5934c3e559f252ba4 (commit)
from fdffbd2e7b03c5dba4bd606973fa5f41a43dc812 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c1f7086e75a8683f3fc0720a3b2a48f3ad1240b0
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date: Fri Aug 22 10:24:33 2014 +0200
install: rely on forge_get_config for post-install
diff --git a/src/GNUmakefile b/src/GNUmakefile
index d10b64a..56cda38 100644
--- a/src/GNUmakefile
+++ b/src/GNUmakefile
@@ -99,18 +99,24 @@ uninstall:
## Step 3: configure & update system
+# not relying on 'prefix' for post-install:
+source_path:=$(shell forge_get_config source_path)
post-install: post-install-core post-install-plugins
post-install-core: # common+db+web
- $(pkgdatadir)/post-install.d/core.sh
+ $(source_path)/post-install.d/core.sh
post-install-shell:
- $(pkgdatadir)/post-install.d/shell/shell.sh
+ $(source_path)/post-install.d/shell/shell.sh configure
-PLUGINS_INSTALLED:=$(shell ls $(pkgdatadir)/plugins 2>/dev/null)
+PLUGINS_INSTALLED:=$(shell ls $(source_path)/plugins 2>/dev/null)
PLUGINS_POST_INSTALL_TARGETS=$(addprefix post-install-plugin-,$(PLUGINS_INSTALLED))
post-install-plugins: $(PLUGINS_POST_INSTALL_TARGETS)
-post-install-plugin-%: $(pkgdatadir)/plugins/%/
- $(pkgdatadir)/post-install.d/plugin.sh $*
+post-install-plugin-%: $(source_path)/plugins/%/
+ $(source_path)/post-install.d/common/plugin.sh $*
+
+
+## TODO: make uninstall? make purge?
+
clean:
# nothing for now
commit f53909ae0b78e98140c09df5934c3e559f252ba4
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date: Fri Aug 22 10:24:07 2014 +0200
vm: missing whitespace in the bash prompt
diff --git a/vm/packer/file/bashrc-rpm b/vm/packer/file/bashrc-rpm
index 0770dcd..859edd1 100644
--- a/vm/packer/file/bashrc-rpm
+++ b/vm/packer/file/bashrc-rpm
@@ -11,4 +11,4 @@ if [ -f /etc/bashrc ]; then
. /etc/bashrc
fi
-PS1='DEV:[\u@\h \W]\$'
\ No newline at end of file
+PS1='DEV:[\u@\h \W]\$ '
\ No newline at end of file
-----------------------------------------------------------------------
Summary of changes:
src/GNUmakefile | 16 +++++++++++-----
vm/packer/file/bashrc-rpm | 2 +-
2 files changed, 12 insertions(+), 6 deletions(-)
hooks/post-receive
--
FusionForge
More information about the Fusionforge-commits
mailing list