Compare revisions

John Harris · John Harris · John Harris · John Harris · John Harris · Dean Lovett
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
-release:version:
+include:
-  image: gitlab.nexdev.uk:5555/pub/nexus-release-image/master
+  - project: nexus-mods/devops/ci/nexus-auto-devops
-  stage: deploy
+    file: /Build.gitlab-ci.yml
-  before_script:
+  - project: nexus-mods/devops/ci/nexus-auto-devops
-    - eval $(ssh-agent -s)
+    file: /Release.gitlab-ci.yml
-    - echo "$CI_DEPLOY_KEY" | tr -d '\r' | ssh-add -
-    - ssh-keyscan gitlab.nexdev.uk >> ~/.ssh/known_hosts
-  script:
-    - /build/release.sh
-  tags:
-    - nexus_runner
-  only:
-    - master
\ No newline at end of file
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
-# Changelog
-All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
-### [1.5.4](https://gitlab.nexdev.uk/pub/nexus-tools/-/compare/v1.5.3...v1.5.4) (2023-02-10)
-### Bug Fixes
-* remove tool containers after running ([1f40893](https://gitlab.nexdev.uk/pub/nexus-tools/-/commit/1f40893b08aa4499843a9675e4f6da7801737480))
-### [1.5.3](https://gitlab.nexdev.uk/pub/nexus-tools/-/compare/v1.5.2...v1.5.3) (2023-02-09)
-### [1.5.2](https://gitlab.nexdev.uk/pub/nexus-tools/-/compare/v1.5.1...v1.5.2) (2023-02-02)
-### [1.5.1](https://gitlab.nexdev.uk/pub/nexus-tools/-/compare/v1.5.0...v1.5.1) (2022-10-05)
-### Bug Fixes
-* updated CQ image ([dc8dc02](https://gitlab.nexdev.uk/pub/nexus-tools/-/commit/dc8dc02597239fd6f2d998fb7ccde775afd14c50))
-## [1.5.0](https://gitlab.nexdev.uk/pub/nexus-tools/-/compare/v1.4.0...v1.5.0) (2022-05-12)
-### Features
-* Always get latest code quality tools ([0ba8463](https://gitlab.nexdev.uk/pub/nexus-tools/-/commit/0ba84635fbac6912b95c9750cda4f9a0411cc9be))
-## [1.4.0](https://gitlab.nexdev.uk/pub/nexus-tools/-/compare/v1.3.5...v1.4.0) (2022-05-09)
-### Features
-* Use new registry address ([921eb16](https://gitlab.nexdev.uk/pub/nexus-tools/-/commit/921eb1685dbf92f0e8317a0fbbf9e35cda9c0d2e))
-### [1.3.5](https://gitlab.nexdev.uk/pub/nexus-tools/-/compare/v1.3.4...v1.3.5) (2022-04-25)
-### Bug Fixes
-* updated gemfile ref ([4db8609](https://gitlab.nexdev.uk/pub/nexus-tools/-/commit/4db86092f5728a369c6f93232d6d1d5fc6e35b1e))
-### [1.3.4](https://gitlab.nexdev.uk/pub/nexus-tools/-/compare/v1.3.3...v1.3.4) (2022-04-23)
-### Bug Fixes
-* updated gu version ([4a958fe](https://gitlab.nexdev.uk/pub/nexus-tools/-/commit/4a958fe3416bc56d69de86342e180e0acf1ca906))
-### [1.3.3](https://gitlab.nexdev.uk/pub/nexus-tools/-/compare/v1.3.2...v1.3.3) (2022-04-23)
-### Bug Fixes
-* added warning for self-update ([660f429](https://gitlab.nexdev.uk/pub/nexus-tools/-/commit/660f4290ebb5c3d0d511935c679ae2888174af06))
-### [1.3.2](https://gitlab.nexdev.uk/pub/nexus-tools/-/compare/v1.3.1...v1.3.2) (2022-03-31)
-### Bug Fixes
-* updated bu ([9e722e4](https://gitlab.nexdev.uk/pub/nexus-tools/-/commit/9e722e407a6a6a1b1ca4045fb5a5b38b073ac68f))
-### [1.3.1](https://gitlab.nexdev.uk/pub/nexus-tools/-/compare/v1.3.0...v1.3.1) (2022-03-31)
-### Bug Fixes
-* Updated BU version ([da64dd9](https://gitlab.nexdev.uk/pub/nexus-tools/-/commit/da64dd91765751423721ee750992ad43b62ce207))
-## [1.3.0](https://gitlab.nexdev.uk/pub/nexus-tools/-/compare/v1.2.1...v1.3.0) (2022-03-28)
-### Features
-* gemfile updater now uses ruby 2.7.5 ([45b6af2](https://gitlab.nexdev.uk/pub/nexus-tools/-/commit/45b6af28312b0c448835abcaff15b547a0afba34))
-### [1.2.1](https://gitlab.nexdev.uk/pub/nexus-tools/-/compare/v1.2.0...v1.2.1) (2021-12-14)
-## [1.2.0](https://gitlab.nexdev.uk/pub/nexus-tools/-/compare/v1.1.1...v1.2.0) (2021-12-14)
-### Features
-* add logs command ([e576c86](https://gitlab.nexdev.uk/pub/nexus-tools/-/commit/e576c86c1fa538a4f1f530e2484eaf0bd6a47dfa))
-### [1.1.1](https://gitlab.nexdev.uk/pub/nexus-tools/-/compare/v1.1.0...v1.1.1) (2021-08-23)
-## [1.1.0](https://gitlab.nexdev.uk/pub/nexus-tools/-/compare/v1.0.6...v1.1.0) (2021-06-25)
-### Features
-* add --logs flag to some commands ([d307b1c](https://gitlab.nexdev.uk/pub/nexus-tools/-/commit/d307b1c402b70fb78872286382f3106f5ba53be7))
-### [1.0.6](https://gitlab.nexdev.uk/pub/nexus-tools/-/compare/v1.0.5...v1.0.6) (2021-05-16)
-### Bug Fixes
-* allowed shorthand version command ([8a0b463](https://gitlab.nexdev.uk/pub/nexus-tools/-/commit/8a0b463a2d700802a0efcae38a9a6517178e6e06))
-### [1.0.5](https://gitlab.nexdev.uk/pub/nexus-tools/-/compare/v1.0.4...v1.0.5) (2021-05-16)
-### Bug Fixes
-* version command ([4baf182](https://gitlab.nexdev.uk/pub/nexus-tools/-/commit/4baf182047f13edfba2c715a74ff3c344110e252))
-### [1.0.4](https://gitlab.nexdev.uk/pub/nexus-tools/-/compare/v1.0.3...v1.0.4) (2021-05-16)
-### Bug Fixes
-* update was pulling incorrect files ([5f6495a](https://gitlab.nexdev.uk/pub/nexus-tools/-/commit/5f6495af12031e627cea685f66f453914536df7a))
-### [1.0.3](https://gitlab.nexdev.uk/pub/nexus-tools/-/compare/v1.0.2...v1.0.3) (2021-05-16)
-### Bug Fixes
-* version ([bde0414](https://gitlab.nexdev.uk/pub/nexus-tools/-/commit/bde0414bc33c8286880281987c50e0678b77d3cf))
-### [1.0.2](https://gitlab.nexdev.uk/pub/nexus-tools/-/compare/v1.0.1...v1.0.2) (2021-05-16)
-### Bug Fixes
-* install script now fixed ([dd07c96](https://gitlab.nexdev.uk/pub/nexus-tools/-/commit/dd07c96d9146986dc04cd2af5b4d0505289a0dce))
-### 1.0.1 (2021-05-16)
-### Bug Fixes
-* added new update and install command ([7c4a3b0](https://gitlab.nexdev.uk/pub/nexus-tools/-/commit/7c4a3b02da4054ab5004bf88f624b754594b21d3))
-* added version command ([9dbbe65](https://gitlab.nexdev.uk/pub/nexus-tools/-/commit/9dbbe6592d3cc8ba981a2fc35d85a87565827910))
-* fixed update ([85fe6ee](https://gitlab.nexdev.uk/pub/nexus-tools/-/commit/85fe6ee1dbb225af297cbe8727abba0e2349d3ac))
-### [1.0.8](https://gitlab.nexdev.uk///compare/v1.0.7...v1.0.8) (2021-05-16)
-### [1.0.7](https://gitlab.nexdev.uk///compare/v1.0.6...v1.0.7) (2021-05-16)
-### [1.0.6](https://gitlab.nexdev.uk///compare/v1.0.5...v1.0.6) (2021-05-16)
-### [1.0.5](https://gitlab.nexdev.uk///compare/v1.0.4...v1.0.5) (2021-05-16)
-### [1.0.4](https://gitlab.nexdev.uk///compare/v1.0.3...v1.0.4) (2021-05-16)
-### [1.0.3](https://gitlab.nexdev.uk///compare/v1.0.2...v1.0.3) (2021-05-16)
-### [1.0.2](https://gitlab.nexdev.uk///compare/v1.0.1...v1.0.2) (2021-05-16)
-### 1.0.1 (2021-05-16)
-### Bug Fixes
-* added new update and install command ([7c4a3b0](https://gitlab.nexdev.uk///commit/7c4a3b02da4054ab5004bf88f624b754594b21d3))
-* fixed update ([85fe6ee](https://gitlab.nexdev.uk///commit/85fe6ee1dbb225af297cbe8727abba0e2349d3ac))
--- a/NEXUS_TOOLS_VERSION
+++ b/NEXUS_TOOLS_VERSION
-1.5.4
+3.2.1
\ No newline at end of file
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ Useful CLI tool for running our docker-compose stacks, code quality and other de
 To install the nexus development tools, run the following one-line command:
 ```shell
-wget -O - https://gitlab.nexdev.uk/pub/nexus-tools/-/raw/master/install.sh | bash
+wget -O - https://gitlab.nexdev.uk/nexus-mods/public/nexus-tools/-/raw/master/install.sh | bash
 ```
 ### Manual Install

--- a/install.sh
+++ b/install.sh
 #!/bin/bash
+GREEN='\033[1;32m'
+BLUE='\033[1;34m'
+NC='\033[0m' # No Color
+DATE_FORMAT='+%Y-%m-%d %H:%M:%S.%3N'
+function success {
+  echo -e "[$(date "${DATE_FORMAT}")] ${GREEN}$1${NC}"
+}
+function info {
+  echo -e "[$(date "${DATE_FORMAT}")] ${BLUE}$1${NC}"
+}
 set -e
 mkdir -p ~/nexus-tools
-wget https://gitlab.nexdev.uk/pub/nexus-tools/-/raw/master/run.sh -O ~/nexus-tools/nexus-tools.sh
+wget -q --show-progress https://gitlab.nexdev.uk/nexus-mods/public/nexus-tools/-/raw/master/run.sh -O ~/nexus-tools/nexus-tools.sh
-wget https://gitlab.nexdev.uk/pub/nexus-tools/-/raw/master/NEXUS_TOOLS_VERSION -O ~/nexus-tools/VERSION
+wget -q --show-progress https://gitlab.nexdev.uk/nexus-mods/public/nexus-tools/-/raw/master/NEXUS_TOOLS_VERSION -O ~/nexus-tools/VERSION
 chmod +x ~/nexus-tools/nexus-tools.sh
-echo 'alias nexus="~/nexus-tools/nexus-tools.sh"' >> ~/.bashrc
+# Remove alias from old .bashrc location, prefer aliases file.
\ No newline at end of file
+sed -i '/^alias nexus/d' "$HOME/.bashrc"
+shopt -s expand_aliases
+TOOLS_ALIAS="alias nexus=\"~/nexus-tools/nexus-tools.sh\""
+ALIASES_FILE="$HOME/.bash_aliases"
+if [[ ! -f "$ALIASES_FILE" ]]; then
+  touch "$ALIASES_FILE"
+fi
+source $ALIASES_FILE
+TOOLS_INSTALLED=
+if [[ "$(type -t nexus)" == "alias" ]]; then
+  # alias exists, check whether it needs updating.
+  INSTALLED_TOOLS_ALIAS=$(cat $ALIASES_FILE | grep "^alias nexus" | tail -n1)
+  if [[ "$INSTALLED_TOOLS_ALIAS" == "$TOOLS_ALIAS" ]]; then
+    TOOLS_INSTALLED=true
+  else
+    info "removing old alias.."
+    sed -i '/^alias nexus/d' $ALIASES_FILE
+  fi
+fi
+if [[ "$TOOLS_INSTALLED" == "true" ]]; then
+  success "nexus alias already installed and up to date."
+else
+  info "installing nexus alias.."
+  echo "$TOOLS_ALIAS" >>"$ALIASES_FILE"
+  source $ALIASES_FILE
+fi
+info "Tools ready. Existing shells will need to source $ALIASES_FILE"
--- a/run.sh
+++ b/run.sh
@@ -12,6 +12,7 @@ display_help() {
    echo "restart                     Stops and then starts a docker-compose service"
    echo "rebuild                     Stops, builds and then starts a docker-compose service"
    echo "logs                        Shows the logs for a docker-compose service"
+    echo "changelog, cl               Runs the service changelog tool, for managing compiled changelogs"
    echo "cq, code-quality            Runs the nexus code quality tool"
    echo "gu, gemfile-updater         Runs the gemfile updater tool, outputting common gemfiles in the console"
    echo "bu, bundle-update           Mounts the Gemfile and lockfile and runs bundle update."
@@ -61,19 +62,27 @@ case "$1" in
    ;;
  cq|code-quality)
    shift
-    CQ_IMAGE=registry.nexusmods.com/nexus-mods/devops/tools/nexus-code-quality:stable
+    CQ_IMAGE=nexusmods/nexus-code-quality:stable
    docker pull $CQ_IMAGE
    docker run --rm -v "$PWD":/app/mounted $CQ_IMAGE "$@"
    ;;
+  changelog|cl)
+    shift
+    CL_IMAGE=nexusmods/services-changelog:stable
+    docker pull $CL_IMAGE
+    docker run --rm -v  ${SSH_AUTH_SOCK}:/ssh-agent -e SSH_AUTH_SOCK=/ssh-agent -v "$PWD":/app $CL_IMAGE "$@"
+    ;;
  gu|gemfile-updater)
    shift
-    GU_IMAGE=registry.nexusmods.com/nexus-mods/devops/tools/base-image-gemfile-updater:stable
+    GU_IMAGE=nexusmods/gemfile-updater:stable
    docker pull $GU_IMAGE
-    docker run --rm -it -v "$(pwd)":/app -v /usr/local/bundle:/usr/local/bundle $GU_IMAGE "$@"
+    docker run --rm -it -v "$(pwd)":/app $GU_IMAGE "$@"
    ;;
  bu|bundle-update)
    shift
-    docker run --rm -it -v "$(pwd)":/app -v /usr/local/bundle:/usr/local/bundle gitlab.nexdev.uk:5555/pub/bundle-updater:v1.0.7 "$@"
+    BU_IMAGE=nexusmods/bundle-updater:stable
+    docker pull $BU_IMAGE
+    docker run --rm -it -v "$(pwd)":/app $BU_IMAGE "$@"
    echo "Container now must be rebuilt!"
    ;;
  -v|version)
@@ -84,15 +93,15 @@ case "$1" in
  update)
    shift
    echo "Downloading new version"
-    wget https://gitlab.nexdev.uk/pub/nexus-tools/-/raw/master/run.sh -O ~/nexus-tools/nexus-tools.sh
+    wget https://gitlab.nexdev.uk/nexus-mods/public/nexus-tools/-/raw/master/run.sh -O ~/nexus-tools/nexus-tools.sh
-    wget https://gitlab.nexdev.uk/pub/nexus-tools/-/raw/master/NEXUS_TOOLS_VERSION -O ~/nexus-tools/VERSION
+    wget https://gitlab.nexdev.uk/nexus-mods/public/nexus-tools/-/raw/master/NEXUS_TOOLS_VERSION -O ~/nexus-tools/VERSION
    ;;
  *)
    display_help
    ;;
 esac
-wget -q https://gitlab.nexdev.uk/pub/nexus-tools/-/raw/master/NEXUS_TOOLS_VERSION -O ~/nexus-tools/LATEST_VERSION
+wget -q https://gitlab.nexdev.uk/nexus-mods/public/nexus-tools/-/raw/master/NEXUS_TOOLS_VERSION -O ~/nexus-tools/LATEST_VERSION
 if ! cmp -s ~/nexus-tools/LATEST_VERSION ~/nexus-tools/VERSION; then
No results found