From 260dfb61cb1a8e345f73819f19cf5773f654d0e7 Mon Sep 17 00:00:00 2001 From: MDLeom <2809763-curben@users.noreply.gitlab.com> Date: Fri, 7 Jan 2022 10:35:02 +0000 Subject: [PATCH] refactor: move all scripts to src/ --- .gitlab-ci.yml | 8 ++++---- README.md | 2 +- {utils => src}/badge.sh | 0 {utils => src}/commit.sh | 0 script.sh => src/script.sh | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) rename {utils => src}/badge.sh (100%) rename {utils => src}/commit.sh (100%) rename script.sh => src/script.sh (99%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aa14065f..0b28e911 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,18 +18,18 @@ build_job: - chmod 644 ~/.ssh/known_hosts script: - - sh script.sh + - sh src/script.sh - git checkout master - git config --global user.name "curben-bot" - git config --global user.email "3048979-curben-bot@users.noreply.gitlab.com" # Commit the changes - - sh utils/commit.sh + - sh src/commit.sh # Generate successful status badge - mkdir -p .gitlab/ - - sh utils/badge.sh "success" + - sh src/badge.sh "success" - git add .gitlab/status.svg # Only commit when diff exists https://stackoverflow.com/a/8123841 - git diff-index --quiet HEAD || git commit -m "Success pipeline" @@ -67,7 +67,7 @@ failed_job: - git config --global user.email "3048979-curben-bot@users.noreply.gitlab.com" - mkdir -p .gitlab/ - - sh utils/badge.sh "failed" + - sh src/badge.sh "failed" - git add .gitlab/status.svg - git diff-index --quiet HEAD || git commit -m "Failed pipeline" - ssh -T git@gitlab.com diff --git a/README.md b/README.md index 4588c9b8..0531135f 100644 --- a/README.md +++ b/README.md @@ -746,7 +746,7 @@ See [FAQ](https://gitlab.com/curben/urlhaus-filter/wikis/faq). [Creative Commons Zero v1.0 Universal](LICENSE.md) -[badge.sh](utils/badge.sh) & [.gitlab/](.gitlab/) contain badges that are licensed by [Shields.io](https://shields.io) under [CC0 1.0](LICENSE.md) +[badge.sh](src/badge.sh) & [.gitlab/](.gitlab/) contain badges that are licensed by [Shields.io](https://shields.io) under [CC0 1.0](LICENSE.md) [URLhaus](https://urlhaus.abuse.ch/): [CC0](https://creativecommons.org/publicdomain/zero/1.0/) diff --git a/utils/badge.sh b/src/badge.sh similarity index 100% rename from utils/badge.sh rename to src/badge.sh diff --git a/utils/commit.sh b/src/commit.sh similarity index 100% rename from utils/commit.sh rename to src/commit.sh diff --git a/script.sh b/src/script.sh similarity index 99% rename from script.sh rename to src/script.sh index ca9c4b99..4ae4bf61 100644 --- a/script.sh +++ b/src/script.sh @@ -3,8 +3,8 @@ set -efux -o pipefail ## Create a temporary working folder -mkdir -p "tmp/" -cd "tmp/" +mkdir -p "../tmp/" +cd "../tmp/" ## Prepare datasets