Skip to content

Commit d2f682c

Browse files
committed
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...
1 parent 2ed2cad commit d2f682c

File tree

3 files changed

+18
-12
lines changed

3 files changed

+18
-12
lines changed

README.adoc

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -695,29 +695,35 @@ If you need username and password to access the custom repository:
695695
Download an official plugin from source control and place it in the plugins directory.
696696
It's able to handle branches switches
697697

698+
[IMPORTANT]
699+
====
700+
You need to use the last Git version, at least a 2.26 version
701+
====
702+
703+
698704
MS Windows: `pullPluginSource example` +
699705
Unix-like OS: `./pullPluginSource.sh example`
700706

701707
[[pull-all-official-plugins-from-source-control]]
702708
=== Pull all official plugins from source control
703709

704-
Download all officially supported plugins from source control (currently
705-
git) and place them in /plugins.
710+
Download all officially supported plugins from source control and place them in /plugins.
706711
It's able to handle branches switches
707712

708-
WARNING! This task deletes the /plugins directory and replaces it with the
709-
official plugins.
713+
[CAUTION]
714+
====
715+
This task deletes the /plugins directory and replaces it with the official plugins.
716+
====
717+
718+
[IMPORTANT]
719+
====
720+
You need to use the last Git version, at least a 2.26 version
721+
====
710722

711723
MS Windows: `pullAllPluginsSource` +
712724
Unix-like OS: `./pullAllPluginsSource.sh`
713725

714726

715-
This task makes it easy to download and develop officially supported plugins. It
716-
is mostly used by developers or individuals working on the trunk branch. We do
717-
not recommend using this task on releases of OFBiz, instead consider using the
718-
"pullPlugin" task to get the correct version of a plugin compatible with your
719-
release.
720-
721727
[[install-a-plugin]]
722728
=== Install a plugin
723729

pullAllPluginsSource.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ cd plugins
3333
# By default the clone branch is trunk
3434
if [ ! $branch = trunk ]
3535
then
36-
git switch "$branch"
36+
git switch -C "$branch"
3737
fi
3838

3939
# remove .git, in this case it's big useless information

pullPluginSource.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,6 @@ rm temp.txt
4949
# By default the clone branch is trunk
5050
if [ ! "$branch" = trunk ]
5151
then
52-
git switch "$branch"
52+
git switch -C "$branch"
5353
fi
5454
cd ..

0 commit comments

Comments
 (0)