remove workarounds for otel injection

package/DEBIAN/control

@@ -1,5 +1,5 @@
 Package: gitaptly
-Version: 3.2.1
+Version: 3.3.0
 Architecture: all
 Depends: debconf, bash, jq, cron, gzip, dpkg-dev, curl, wget, python3, python3-pip, python3-venv
 Suggests: opentelemetry-shell (>= 1.0.0)

package/DEBIAN/postinst

@@ -37,7 +37,7 @@ if [ "$MODE" = "cache" ]; then
 elif [ "$MODE" = "proxy" ]; then
   rm $(find /var/lib/gitaptly/pool/main/*/*/ -type f) || true
 fi
-bash /usr/bin/gitaptly_update.sh
+gitaptly_update
 
 systemctl daemon-reload
 systemctl enable gitaptly

package/etc/cron.d/gitaptly

@@ -1,2 +1,2 @@
-0 * * * * root gitaptly_update.sh
+0 * * * * root gitaptly_update
 

package/etc/systemd/system/gitaptly.service

@@ -8,6 +8,6 @@ RestartSec=1
 StartLimitBurst=10
 User=root
 WorkingDirectory=/opt/gitaptly
-ExecStart=/bin/bash /usr/bin/gitaptly_run_ftp.sh
+ExecStart=gitaptly_run_ftp
 [Install]
 WantedBy=multi-user.target

package/usr/bin/gitaptly_reset.sh → package/usr/bin/gitaptly_reset

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 set -e
 source /opt/gitaptly/env
 if [ -f /usr/bin/opentelemetry_shell.sh ]; then
@@ -18,4 +18,4 @@ fi
 rm /var/lib/gitaptly/dists/stable/main/binary-all/Packages
 rm -rf /var/lib/gitaptly/pool/main/*
 rm -rf /var/lib/gitaptly/cgi-bin/main/*
-bash /usr/bin/gitaptly_update.sh
+gitaptly_update

package/usr/bin/gitaptly_run_ftp.sh → package/usr/bin/gitaptly_run_ftp

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 set -e
 source /opt/gitaptly/env
 source /opt/gitaptly/bin/activate

package/usr/bin/gitaptly_scan.sh → package/usr/bin/gitaptly_scan

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 set -e
 
 owner=$1

package/usr/bin/gitaptly_serve.sh → package/usr/bin/gitaptly_serve

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 set -e
 source /opt/gitaptly/env
 if [ -f /usr/bin/opentelemetry_shell.sh ]; then
@@ -34,4 +34,4 @@ fi
 
 echo "Content-Type: application/vnd.debian.binary-package"
 echo ""
-wget -O - $(bash /usr/bin/gitaptly_scan.sh $owner $repo | (grep "$file"'$' || true) | head --lines=1)
+wget -O - $(gitaptly_scan $owner $repo | (grep "$file"'$' || true) | head --lines=1)

package/usr/bin/gitaptly_update.sh → package/usr/bin/gitaptly_update

@@ -31,7 +31,7 @@ if [ "$MODE" = 'cache' ]; then
     owner=$(echo $line | cut -d "/" -f 1)
     repo=$(echo $line | cut -d "/" -f 2)
     mkdir -p pool/main/$owner/$repo
-    wget -nc -P pool/main/$owner/$repo $(bash /usr/bin/gitaptly_scan.sh $owner $repo) || true
+    wget -nc -P pool/main/$owner/$repo $(gitaptly_scan $owner $repo) || true
   done < /etc/gitaptly.conf
   dpkg-scanpackages --multiversion pool/ > dists/stable/main/binary-all/Packages
 
@@ -45,7 +45,7 @@ elif [ "$MODE" = 'proxy' ]; then
     repo=$(echo $line | cut -d "/" -f 2)
     mkdir -p pool/main/$owner/$repo
     mkdir -p cgi-bin/main/$owner/$repo
-    for url in $(bash /usr/bin/gitaptly_scan.sh $owner $repo)
+    for url in $(gitaptly_scan $owner $repo)
     do
       file=$(echo $url | rev | cut -d "/" -f 1 | rev)
       if [ -f cgi-bin/main/$owner/$repo/$file ]; then
@@ -54,7 +54,7 @@ elif [ "$MODE" = 'proxy' ]; then
       wget -nc -O pool/main/$owner/$repo/$file $url
       dpkg-scanpackages --multiversion pool/main/$owner/$repo/$file | sed "s/Filename: .*/Filename: cgi-bin\/main\/$owner\/$repo\/$file/" >> dists/stable/main/binary-all/Packages
       rm pool/main/$owner/$repo/$file
-      ln --symbolic /usr/bin/gitaptly_serve.sh cgi-bin/main/$owner/$repo/$file
+      ln --symbolic /usr/bin/gitaptly_serve cgi-bin/main/$owner/$repo/$file
     done
   done < /etc/gitaptly.conf
 
@@ -63,4 +63,4 @@ else
 fi
 
 gzip -9 < dists/stable/main/binary-all/Packages > dists/stable/main/binary-all/Packages.gz
-bash /usr/bin/gitaptly_create_release.sh dists/stable > dists/stable/Release
+gitaptly_create_release dists/stable > dists/stable/Release