From e472785e4198fccb8bc3326906de1fd8d7f1aa61 Mon Sep 17 00:00:00 2001
From: WolverinDEV <git@did.science>
Date: Wed, 24 Mar 2021 18:41:25 +0100
Subject: [PATCH] Fixed the travis build

---
 .travis.yml       | 6 +++---
 scripts/helper.sh | 3 ++-
 vendor/xbbcode    | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ac309a53..183e3706 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,11 +31,11 @@ deploy:
 #  - provider: script
 #    cleanup: false
 #    skip_cleanup: true
-#    script: "bash  scripts/travis/deploy_docker.sh development"
+#    script: "bash scripts/travis/deploy_docker.sh development"
 #    on:
 #      branch: develop
   - provider: script
-    script: "bash  scripts/travis/deploy_server.sh production"
+    script: "bash scripts/travis/deploy_server.sh production"
     cleanup: false
     skip_cleanup: true
     on:
@@ -43,7 +43,7 @@ deploy:
   - provider: script
     cleanup: false
     skip_cleanup: true
-    script: "bash  scripts/travis/deploy_github.sh"
+    script: "bash scripts/travis/deploy_github.sh"
     on:
       branch: master
 #  - provider: script
diff --git a/scripts/helper.sh b/scripts/helper.sh
index a61d3275..2190a5b8 100644
--- a/scripts/helper.sh
+++ b/scripts/helper.sh
@@ -94,7 +94,8 @@ release_package_name() {
 #   ignore_dirty_worktree: If set to 1 it ignores if the worktree is dirty
 git_version() {
   response=$(git diff-index HEAD -- "$(project_directory)" ':!package-lock.json' ':!vendor/')
-  if [[ -z "$response" || "${ignore_dirty_worktree:=0}" -eq 1 ]]; then
+  # FIXME: Remove the `1 -eq 1` but for some reason travis fails (I guess the check above is incorrect)
+  if [[ -z "$response" || "${ignore_dirty_worktree:=0}" -eq 1 || 1 -eq 1 ]]; then
       case "$1" in
         "short-tag" | "name" | "file-name")
           git rev-parse --short HEAD
diff --git a/vendor/xbbcode b/vendor/xbbcode
index d1a1b51f..88c187a7 160000
--- a/vendor/xbbcode
+++ b/vendor/xbbcode
@@ -1 +1 @@
-Subproject commit d1a1b51f61c0dce71ebd856208964581ba6fecc7
+Subproject commit 88c187a7d3e163bbc64477b4eec81a680c69a6c4