Merge branch 'bash-tidy' into 'master'

Remove unused bash functions

See merge request gitlab-org/security-products/license-management!224

4 files changed, 6 insertions, 35 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e57de66..5b4021d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # GitLab License management changelog
 
+## v3.25.8
+
+- Remove bash functions that are not in use !224
+
 ## v3.25.7
 
 - Fix path to Java 11 keystore !221
diff --git a/Gemfile.lock b/Gemfile.lock
index e008f1d..7d53243 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,7 +8,7 @@ GIT
 PATH
   remote: .
   specs:
-    license-management (3.25.7)
+    license-management (3.25.8)
       license_finder (~> 6.7)
 
 GEM
diff --git a/config/files/.bashrc b/config/files/.bashrc
index 8349f0b..aaec230 100644
--- a/config/files/.bashrc
+++ b/config/files/.bashrc
@@ -4,7 +4,6 @@ export ASDF_DATA_DIR="/opt/asdf"
 export PATH="${ASDF_DATA_DIR}/shims:${ASDF_DATA_DIR}/bin:/opt/gitlab/.local/bin:${PATH}"
 export HOME="/opt/gitlab"
 
-alias nuget='mono /usr/local/bin/nuget.exe'
 set -o vi
 
 function inflate() {
@@ -16,38 +15,6 @@ function inflate() {
   fi
 }
 
-update_java_home() {
-  local java_path
-  java_path="$(asdf which java)"
-  if [[ -n "${java_path}" ]]; then
-    export JAVA_HOME
-   JAVA_HOME="$(dirname "$(dirname "$(realpath "${java_path}")")")"
-  fi
-}
-
-function switch_to_exact() {
-  local tool=$1
-  local version=$2
-
-  asdf shell "$tool" "$version"
-  if [[ "$tool" = "java" ]]; then
-    update_java_home
-  fi
-}
-
-function switch_to() {
-  local tool=$1
-  local major_version=$2
-  local version
-  version="$(grep "$tool" "/opt/gitlab/.tool-versions"| tr ' ' '\n' | grep "^$major_version")"
-
-  switch_to_exact "$tool" "$version"
-}
-
-function major_version_from() {
-  echo "$1" | cut -d'.' -f1
-}
-
 function enable_dev_mode() {
   unset HISTFILESIZE
   unset HISTSIZE
diff --git a/lib/license/management/version.rb b/lib/license/management/version.rb
index 8e2f460..4c03bd5 100644
--- a/lib/license/management/version.rb
+++ b/lib/license/management/version.rb
@@ -2,6 +2,6 @@
 
 module License
   module Management
-    VERSION = '3.25.7'
+    VERSION = '3.25.8'
   end
 end