[Libreoffice-commits] core.git: g

[Michael Stahl (via logerrit)]

 g |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit aa8ef74b475a6fbd6e4ec27c42941aa274998df6
Author:     Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Mon May 30 21:30:04 2022 +0200
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Tue May 31 10:29:45 2022 +0200

    g: we are not, in fact, in the BUILDDIR
    
    For an out-of-tree build, "make fetch" poinlessly clones all git
    submodules.
    
    Change-Id: If4afb218946f49ba934f68b35806fd8143c39387
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135143
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>

diff --git a/g b/g
index 021ad6c41cde..fdf95c8278ce 100755
--- a/g
+++ b/g
@@ -10,9 +10,9 @@ fi
 SUBMODULES_ALL="dictionaries helpcontent2 translations"
 
 pushd $(dirname $0) > /dev/null
-if [ -f config_host.mk ] ; then
-    # we are in the BUILDDIR
-    SRC_ROOT=$(< config_host.mk grep -a SRC_ROOT | sed -e "s/.*=//")
+if [ -f ${BUILDDIR}/config_host.mk ] ; then
+    # we are in the SRCDIR
+    SRC_ROOT=$(< ${BUILDDIR}/config_host.mk grep -a SRC_ROOT | sed -e 
"s/.*=//")
 else
     SRC_ROOT=$(pwd)
 fi
@@ -150,8 +150,8 @@ get_active_submodules()
 get_configured_submodules()
 {
     SUBMODULES_CONFIGURED=""
-    if [ -f config_host.mk ] ; then
-        SUBMODULES_CONFIGURED=$(< config_host.mk grep -a GIT_NEEDED_SUBMODULES 
| sed -e "s/.*=//")
+    if [ -f ${BUILDDIR}/config_host.mk ] ; then
+        SUBMODULES_CONFIGURED=$(< ${BUILDDIR}/config_host.mk grep -a 
GIT_NEEDED_SUBMODULES | sed -e "s/.*=//")
     else
         # if we need the configured submodule before the configuration is 
done. we assumed you want them all
         SUBMODULES_CONFIGURED=${SUBMODULES_ALL?}
@@ -161,12 +161,12 @@ get_configured_submodules()
 get_git_reference()
 {
     REFERENCED_GIT=""
-    if [ -f config_host.mk ]; then
-        REFERENCED_GIT=$(< config_host.mk grep -a GIT_REFERENCE_SRC | sed -e 
"s/.*=//")
+    if [ -f ${BUILDDIR}/config_host.mk ]; then
+        REFERENCED_GIT=$(< ${BUILDDIR}/config_host.mk grep -a 
GIT_REFERENCE_SRC | sed -e "s/.*=//")
     fi
     LINKED_GIT=""
-    if [ -f config_host.mk ]; then
-        LINKED_GIT=$(< config_host.mk grep -a GIT_LINK_SRC | sed -e "s/.*=//")
+    if [ -f ${BUILDDIR}/config_host.mk ]; then
+        LINKED_GIT=$(< ${BUILDDIR}/config_host.mk grep -a GIT_LINK_SRC | sed 
-e "s/.*=//")
     fi
 }