diff --git a/contrib/start-server.sh b/contrib/start-server.sh index f357e4199381cee5d634dbdd2f85031580692074..48e373b6d74ce9fd24f2b587e187ed12cd87a419 100755 --- a/contrib/start-server.sh +++ b/contrib/start-server.sh @@ -1,14 +1,14 @@ #!/bin/sh -deps_file=/var/lib/gitlab-deps/deps.list +rev_deps_file=/var/lib/gitlab-deps/reverse-deps.list if [ -z "$GITLAB_URL" ]; then echo "Gitlab-deps is not configured (GITLAB_URL empty)" >&2 exit 0 fi -if [ ! -e $deps_file ]; then - echo "No deps.json file, executing update..." >&2 +if [ ! -e $rev_deps_file ]; then + echo "No reverse-deps.list file, executing update..." >&2 /usr/sbin/update-gitlab-deps --no-reload if [ $? -gt 0 ]; then echo "update-gitlab-deps failed" >&2 @@ -20,4 +20,4 @@ exec /usr/bin/gitlab-deps server \ --token-file=$GITLAB_TOKEN_FILE --url=$GITLAB_URL \ --addr=${ADDR:-0.0.0.0} --port=${PORT:-3535} \ --webhook-auth-token=$WEBHOOK_AUTH_TOKEN \ - < $deps_file + < $rev_deps_file diff --git a/contrib/update.sh b/contrib/update.sh index 8bb673a2d8847fba23248113ffd2516dffbaa0af..db3a4b3a3eb7e8704304acad1fb8e7bdaad06840 100755 --- a/contrib/update.sh +++ b/contrib/update.sh @@ -1,6 +1,7 @@ #!/bin/sh deps_file=/var/lib/gitlab-deps/deps.list +rev_deps_file=/var/lib/gitlab-deps/reverse-deps.list reload=1 ret=0 @@ -25,8 +26,9 @@ gitlab-deps list-projects $opts \ | gitlab-deps deps $opts \ > $tmp_file -if ! cmp $tmp_file $deps_file; then +if ! cmp --quiet $tmp_file $deps_file; then mv -f $tmp_file $deps_file + awk '{print $2, $1}' < $deps_file > $rev_deps_file if [ $reload -eq 1 ]; then systemctl reload-or-restart gitlab-deps ret=$?