added my-documents + verbose logs on Git::pullIfNoChanges

fchastanet · Jan 14, 2024 · fd5507f · fd5507f
1 parent 2f52d3a
commit fd5507f
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 17 deletions.
diff --git a/bin/doc b/bin/doc
@@ -891,11 +891,12 @@ Git::cloneOrPullIfNoChanges() {
   shift || true
 
   if [[ -d "${dir}/.git" ]]; then
-    if Git::pullIfNoChanges "${dir}"; then
-      # shellcheck disable=SC2086
-      if [[ "$(type -t ${pullCallback})" = "function" ]]; then
-        ${pullCallback} "${dir}"
-      fi
+    if ! Git::pullIfNoChanges "${dir}"; then
+      return 1
+    fi
+    # shellcheck disable=SC2086
+    if [[ "$(type -t ${pullCallback})" = "function" ]]; then
+      ${pullCallback} "${dir}"
     fi
   else
     Log::displayInfo "cloning ${repo} ..."
@@ -1148,11 +1149,14 @@ Git::pullIfNoChanges() {
     return 3
   fi
   (
-    cd "${dir}" || exit 3
-    git update-index --refresh &>/dev/null || exit 4
+    cd "${dir}" || return 3
+    if ! git update-index --refresh &>/dev/null; then
+      Log::displayWarning "Impossible to update git index of '${dir}' - check if you have modified file"
+      return 4
+    fi
     if ! git diff-index --quiet HEAD --; then
       Log::displayWarning "Pulling git repository '${dir}' avoided as changes detected"
-      exit 2
+      return 2
     fi
     Log::displayInfo "Pull git repository '${dir}' as no changes detected"
     git pull --progress

diff --git a/pages/_navbar.md b/pages/_navbar.md
@@ -2,4 +2,5 @@
 
 [Bash Tools Framework](/) |
 [Bash Tools](https://fchastanet.github.io/bash-tools/) |
-[Bash Dev Env](https://fchastanet.github.io/bash-dev-env/)
+[Bash Dev Env](https://fchastanet.github.io/bash-dev-env/) |
+[My documents](https://fchastanet.github.io/my-documents/)
diff --git a/pages/images/external-link.svg b/pages/images/external-link.svg
diff --git a/pages/index.html b/pages/index.html
@@ -53,6 +53,9 @@
       {
         display: none !important;
       }
+      a:visited {
+        color: inherit;
+      }
     </style>
   </head>
   <body>

diff --git a/src/Git/cloneOrPullIfNoChanges.sh b/src/Git/cloneOrPullIfNoChanges.sh
@@ -18,11 +18,12 @@ Git::cloneOrPullIfNoChanges() {
   shift || true
 
   if [[ -d "${dir}/.git" ]]; then
-    if Git::pullIfNoChanges "${dir}"; then
-      # shellcheck disable=SC2086
-      if [[ "$(type -t ${pullCallback})" = "function" ]]; then
-        ${pullCallback} "${dir}"
-      fi
+    if ! Git::pullIfNoChanges "${dir}"; then
+      return 1
+    fi
+    # shellcheck disable=SC2086
+    if [[ "$(type -t ${pullCallback})" = "function" ]]; then
+      ${pullCallback} "${dir}"
     fi
   else
     Log::displayInfo "cloning ${repo} ..."

diff --git a/src/Git/pullIfNoChanges.sh b/src/Git/pullIfNoChanges.sh
@@ -15,11 +15,14 @@ Git::pullIfNoChanges() {
     return 3
   fi
   (
-    cd "${dir}" || exit 3
-    git update-index --refresh &>/dev/null || exit 4
+    cd "${dir}" || return 3
+    if ! git update-index --refresh &>/dev/null; then
+      Log::displayWarning "Impossible to update git index of '${dir}' - check if you have modified file"
+      return 4
+    fi
     if ! git diff-index --quiet HEAD --; then
       Log::displayWarning "Pulling git repository '${dir}' avoided as changes detected"
-      exit 2
+      return 2
     fi
     Log::displayInfo "Pull git repository '${dir}' as no changes detected"
     git pull --progress