This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new d2f682c2d4 Fixed: Replace SvnCheckout in Gradle (OFBIZ-12868)
d2f682c2d4 is described below
commit d2f682c2d46a6c4b04153c986e72d7c4d9c43db8
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Wed Jan 3 11:33:13 2024 +0100
Fixed: Replace SvnCheckout in Gradle (OFBIZ-12868)
Updates the documentation for pullAllPluginsSource.sh and
pullPluginSource.sh
Uses
git switch -C "$branch"
instead of
git switch "$branch"
in both scripts
There is something weird with pullPluginSource.sh. It works perfectly on
Windows
using git-bash, but in Ubuntu 20.04 it does not add but replaces plugins.
I tested using current last Git version in both OS
(respectively 2.43.0.windows.1 and 2.43.0). It's a minor issue as it does
not
block the CI so I'll review that later...
---
README.adoc | 26 ++++++++++++++++----------
pullAllPluginsSource.sh | 2 +-
pullPluginSource.sh | 2 +-
3 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/README.adoc b/README.adoc
index 4d5996c211..ca6cbd9f2b 100644
--- a/README.adoc
+++ b/README.adoc
@@ -695,29 +695,35 @@ If you need username and password to access the custom
repository:
Download an official plugin from source control and place it in the plugins
directory.
It's able to handle branches switches
+[IMPORTANT]
+====
+You need to use the last Git version, at least a 2.26 version
+====
+
+
MS Windows: `pullPluginSource example` +
Unix-like OS: `./pullPluginSource.sh example`
[[pull-all-official-plugins-from-source-control]]
=== Pull all official plugins from source control
-Download all officially supported plugins from source control (currently
-git) and place them in /plugins.
+Download all officially supported plugins from source control and place them
in /plugins.
It's able to handle branches switches
-WARNING! This task deletes the /plugins directory and replaces it with the
-official plugins.
+[CAUTION]
+====
+ This task deletes the /plugins directory and replaces it with the official
plugins.
+====
+
+[IMPORTANT]
+====
+You need to use the last Git version, at least a 2.26 version
+====
MS Windows: `pullAllPluginsSource` +
Unix-like OS: `./pullAllPluginsSource.sh`
-This task makes it easy to download and develop officially supported plugins.
It
-is mostly used by developers or individuals working on the trunk branch. We do
-not recommend using this task on releases of OFBiz, instead consider using the
-"pullPlugin" task to get the correct version of a plugin compatible with your
-release.
-
[[install-a-plugin]]
=== Install a plugin
diff --git a/pullAllPluginsSource.sh b/pullAllPluginsSource.sh
index fd69ddc790..0551811f74 100755
--- a/pullAllPluginsSource.sh
+++ b/pullAllPluginsSource.sh
@@ -33,7 +33,7 @@ cd plugins
# By default the clone branch is trunk
if [ ! $branch = trunk ]
then
- git switch "$branch"
+ git switch -C "$branch"
fi
# remove .git, in this case it's big useless information
diff --git a/pullPluginSource.sh b/pullPluginSource.sh
index cfe8fdf4c9..6a4948545f 100755
--- a/pullPluginSource.sh
+++ b/pullPluginSource.sh
@@ -49,6 +49,6 @@ rm temp.txt
# By default the clone branch is trunk
if [ ! "$branch" = trunk ]
then
- git switch "$branch"
+ git switch -C "$branch"
fi
cd ..
