Merge branch 'develop' into 'main'

Merging develop into main

See merge request !5

Dockerfile

@@ -53,6 +53,8 @@ RUN echo 'hosts: files dns' > /etc/nsswitch.conf && \
     \
     apk update && \
     apk add --no-cache openssh wget make patch bash fish zsh python3 git git-lfs unzip acl libpng-dev libzip-dev sudo jq nano rsync && \
+    ln -sf python3 /usr/bin/python && \
+    ln -sf pip3 /usr/bin/pip && \
     if [ "${ALPINE_VERSION}" = "3.12" ]; then \
       apk add --no-cache mandoc py3-pip ; \
     elif [ "${ALPINE_VERSION}" = "3.15" ]; then \
@@ -80,8 +82,6 @@ RUN echo 'hosts: files dns' > /etc/nsswitch.conf && \
     ln -sf /lib/libc.musl-x86_64.so.1 /usr/glibc-compat/lib && \
     ln -sf /usr/lib/libgcc_s.so.1 /lib/libgcc_s.so.1 && \
     ln -sf /lib/libgcc_s.so.1 /usr/glibc-compat/lib/ && \
-    ln -sf python3 /usr/bin/python && \
-    ln -sf pip3 /usr/bin/pip && \
     \
     wget -q https://github.com/ahoy-cli/ahoy/releases/download/${AHOY_VERSION}/ahoy-bin-`uname -s`-amd64 -O /usr/local/bin/ahoy && \
     chmod +x /usr/local/bin/ahoy && \

bin/merge

 #!/bin/bash
 
 function gitlab() {
+  echo "   sending request ..."
   output="$(curl --write-out "\nHTTP-Code:%{http_code}" -X "$2" -s -H "Private-Token: ${GITLAB_PRIVATE_TOKEN}" "${GITLAB_URL}"/api/v4/"$3" "$@")"
+  echo "   done"
   result="$(echo "$output" | grep "{")"
   code="$(echo "$output" | grep -m 1 "HTTP-Code:" | cut -d: -f2)"
   if [[ $code -eq $1 ]]; then