diff options
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/lxc-searx.env | 1 | ||||
| -rwxr-xr-x | utils/lxc.sh | 3 | ||||
| -rwxr-xr-x | utils/searx.sh | 5 |
3 files changed, 3 insertions, 6 deletions
diff --git a/utils/lxc-searx.env b/utils/lxc-searx.env index 3121b63ce..4b346cb9e 100644 --- a/utils/lxc-searx.env +++ b/utils/lxc-searx.env @@ -21,7 +21,6 @@ lxc_set_suite_env() { # to disable containers, comment out lines .. # end of standard support see https://wiki.ubuntu.com/Releases - "$LINUXCONTAINERS_ORG_NAME:ubuntu/16.04" "ubu1604" # April 2021 "$LINUXCONTAINERS_ORG_NAME:ubuntu/18.04" "ubu1804" # April 2023 "$LINUXCONTAINERS_ORG_NAME:ubuntu/20.04" "ubu2004" # April 2025 "$LINUXCONTAINERS_ORG_NAME:ubuntu/20.10" "ubu2010" # July 2021 diff --git a/utils/lxc.sh b/utils/lxc.sh index 5385384a2..30936e9b1 100755 --- a/utils/lxc.sh +++ b/utils/lxc.sh @@ -24,13 +24,12 @@ LXC_HOST_PREFIX="${LXC_HOST_PREFIX:-test}" LXC_SHARE_FOLDER="/share" LXC_REPO_ROOT="${LXC_SHARE_FOLDER}/$(basename "${REPO_ROOT}")" -ubu1604_boilerplate=" +ubu1804_boilerplate=" export DEBIAN_FRONTEND=noninteractive apt-get update -y apt-get upgrade -y apt-get install -y git curl wget " -ubu1804_boilerplate="$ubu1604_boilerplate" ubu1904_boilerplate="$ubu1804_boilerplate" # shellcheck disable=SC2034 diff --git a/utils/searx.sh b/utils/searx.sh index a33642ee4..ed015bdd2 100755 --- a/utils/searx.sh +++ b/utils/searx.sh @@ -394,8 +394,8 @@ clone_searx() { info_msg "create local branch ${GIT_BRANCH} from start point: origin/${GIT_BRANCH}" git branch "${GIT_BRANCH}" "origin/${GIT_BRANCH}" fi - if [[ ! $(git branch --show-current) == "${GIT_BRANCH}" ]]; then - warn_msg "take into account, installing branch $GIT_BRANCH while current branch is $(git branch --show-current)" + if [[ ! $(git rev-parse --abbrev-ref HEAD) == "${GIT_BRANCH}" ]]; then + warn_msg "take into account, installing branch $GIT_BRANCH while current branch is $(git rev-parse --abbrev-ref HEAD)" fi export SERVICE_HOME git_clone "$REPO_ROOT" "$SEARX_SRC" \ @@ -503,7 +503,6 @@ pip install -U pip pip install -U setuptools pip install -U wheel pip install -U pyyaml -pip install -U -e . cd ${SEARX_SRC} pip install -e . EOF |