Skip to content

Commit fe6885c

Browse files
PothercaPotherca
committed
Move functions to separate files.
1 parent 2895caf commit fe6885c

6 files changed

+97
-79
lines changed

‎check-sources-for-update.sh‎

Lines changed: 12 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -29,85 +29,18 @@ set -o errexit -o errtrace -o nounset -o pipefail
2929

3030
check_sources_for_update() {
3131

32-
get_local_version() {
33-
local sContent sLocalVersion
34-
35-
readonly sContent="${1?One parameter required: <content>}"
36-
37-
sLocalVersion=$(echo "${sContent}" | grep -E '^VERSION=' | grep -oE '([0-9]+\.?){3}')
38-
39-
if echo "${sLocalVersion}" | grep --quiet '\.0[0-9]';then
40-
# Remove unneeded leading zero
41-
sLocalVersion="$(echo "${sLocalVersion}" | tr '.' "\n" | bc | tr "\n" '.')"
42-
sLocalVersion="${sLocalVersion:0:-1}"
43-
fi
44-
45-
echo "${sLocalVersion}"
46-
}
47-
48-
get_version_from_remote_git() {
49-
local sProject sRemoteVersion
50-
51-
readonly sProject="${1?One parameter required: <github-project>}"
52-
53-
readonly sRemoteVersion="$("${GIT}" ls-remote --tags "git://github.com/${sProject}.git" \
54-
| cut -d'/' -f3 \
55-
| grep -E '^v?[0-9.]+$' \
56-
| grep -oE '[0-9.]+' \
57-
| sort -V \
58-
| tail -n1)" || true
59-
60-
echo "${sRemoteVersion}"
61-
}
62-
63-
compare_versions() {
64-
local sLocalVersion sRemoteVersion sResponse
65-
66-
readonly sLocalVersion="${1?Two parameters required: <local-version> <remote-version>}"
67-
sRemoteVersion="${2?Two parameters required: <local-version> <remote-version>}"
68-
69-
if [[ "${sLocalVersion}" == "" ]] || [[ "${sRemoteVersion}" == "" ]];then
70-
readonly sResponse="${COLOR_RED}No version infromation available${RESET_TEXT}"
71-
else
72-
if echo "${sRemoteVersion}" | grep --quiet -E '^[0-9]+\.[0-9]+$';then
73-
# Pad "x.y" format to "x.y.z" format
74-
sRemoteVersion="${sRemoteVersion}.0"
75-
fi
76-
77-
if [[ "$(echo -e "${sRemoteVersion}\n${sLocalVersion}" | sort -V | tail -n 1)" == "${sLocalVersion}" ]];then
78-
readonly sResponse="${COLOR_GREEN}Up To Date${RESET_TEXT}"
79-
else
80-
readonly sResponse="${COLOR_YELLOW}Newer version available ${TEXT_INVERSE} ${sRemoteVersion} ${RESET_TEXT}"
81-
fi
82-
fi
83-
84-
echo "${sResponse}"
85-
}
86-
87-
get_project_name_from_github_url() {
88-
local sContent sProject sUrl
89-
90-
readonly sContent="${1?One parameter required: <content>}"
91-
92-
readonly sUrl=$(echo "${sContent}" | grep -E '^SOURCE=' | grep -oE 'https?://.*')
93-
readonly sProject="$(echo "${sUrl}" | rev | grep -oE '[^/]+/[^/]+' | rev)"
94-
95-
echo "${sProject}"
96-
}
97-
98-
check_source_for_update() {
99-
local sContent sLocalVersion sProject sRemoteVersion
100-
101-
readonly sContent="${1?One parameter required: <content>}"
102-
readonly sLocalVersion="$(get_local_version "${sContent}")"
103-
readonly sProject="$(get_project_name_from_github_url "${sContent}")"
104-
105-
echo -n "${RESET_TEXT} =====> ${TEXT_BOLD}${sProject}${RESET_TEXT} (${COLOR_BLUE}${sLocalVersion}${RESET_TEXT})"
106-
107-
readonly sRemoteVersion="$(get_version_from_remote_git "${sProject}")"
108-
109-
echo " $(compare_versions "${sLocalVersion}" "${sRemoteVersion}")"
110-
}
32+
local -r sScriptPath="$(realpath "$(dirname "${BASH_SOURCE[0]}")")"
33+
34+
# shellcheck source=./src/function.check_source_for_update.sh
35+
source "${sScriptPath}/src/function.check_source_for_update.sh"
36+
# shellcheck source=./src/function.compare_versions.sh
37+
source "${sScriptPath}/src/function.compare_versions.sh"
38+
# shellcheck source=./src/function.get_local_version.sh
39+
source "${sScriptPath}/src/function.get_local_version.sh"
40+
# shellcheck source=./src/function.get_project_name_from_github_url.sh
41+
source "${sScriptPath}/src/function.get_project_name_from_github_url.sh"
42+
# shellcheck source=./src/function.get_version_from_remote_git.sh
43+
source "${sScriptPath}/src/function.get_version_from_remote_git.sh"
11144

11245
run() {
11346
local sSourcesFile sSourcePaths

‎src/function.check_source_for_update.sh‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#!/usr/bin/env bash
2+
3+
check_source_for_update() {
4+
local sContent sLocalVersion sProject sRemoteVersion
5+
6+
readonly sContent="${1?One parameter required: <content>}"
7+
readonly sLocalVersion="$(get_local_version "${sContent}")"
8+
readonly sProject="$(get_project_name_from_github_url "${sContent}")"
9+
10+
echo -n "${RESET_TEXT} =====> ${TEXT_BOLD}${sProject}${RESET_TEXT} (${COLOR_BLUE}${sLocalVersion}${RESET_TEXT})"
11+
12+
readonly sRemoteVersion="$(get_version_from_remote_git "${sProject}")"
13+
14+
echo " $(compare_versions "${sLocalVersion}" "${sRemoteVersion}")"
15+
}

‎src/function.compare_versions.sh‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
#!/usr/bin/env bash
2+
3+
compare_versions() {
4+
local sLocalVersion sRemoteVersion sResponse
5+
6+
readonly sLocalVersion="${1?Two parameters required: <local-version> <remote-version>}"
7+
sRemoteVersion="${2?Two parameters required: <local-version> <remote-version>}"
8+
9+
if [[ "${sLocalVersion}" == "" ]] || [[ "${sRemoteVersion}" == "" ]];then
10+
readonly sResponse="${COLOR_RED}No version infromation available${RESET_TEXT}"
11+
else
12+
if echo "${sRemoteVersion}" | grep --quiet -E '^[0-9]+\.[0-9]+$';then
13+
# Pad "x.y" format to "x.y.z" format
14+
sRemoteVersion="${sRemoteVersion}.0"
15+
fi
16+
17+
if [[ "$(echo -e "${sRemoteVersion}\n${sLocalVersion}" | sort -V | tail -n 1)" == "${sLocalVersion}" ]];then
18+
readonly sResponse="${COLOR_GREEN}Up To Date${RESET_TEXT}"
19+
else
20+
readonly sResponse="${COLOR_YELLOW}Newer version available ${TEXT_INVERSE} ${sRemoteVersion} ${RESET_TEXT}"
21+
fi
22+
fi
23+
24+
echo "${sResponse}"
25+
}

‎src/function.get_local_version.sh‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#!/usr/bin/env bash
2+
3+
get_local_version() {
4+
local sContent sLocalVersion
5+
6+
readonly sContent="${1?One parameter required: <content>}"
7+
8+
sLocalVersion=$(echo "${sContent}" | grep -E '^VERSION=' | grep -oE '([0-9]+\.?){3}')
9+
10+
if echo "${sLocalVersion}" | grep --quiet '\.0[0-9]';then
11+
# Remove unneeded leading zero
12+
sLocalVersion="$(echo "${sLocalVersion}" | tr '.' "\n" | bc | tr "\n" '.')"
13+
sLocalVersion="${sLocalVersion:0:-1}"
14+
fi
15+
16+
echo "${sLocalVersion}"
17+
}

‎src/function.get_project_name_from_github_url.sh‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/usr/bin/env bash
2+
3+
get_project_name_from_github_url() {
4+
local sContent sProject sUrl
5+
6+
readonly sContent="${1?One parameter required: <content>}"
7+
8+
readonly sUrl=$(echo "${sContent}" | grep -E '^SOURCE=' | grep -oE 'https?://.*')
9+
readonly sProject="$(echo "${sUrl}" | rev | grep -oE '[^/]+/[^/]+' | rev)"
10+
11+
echo "${sProject}"
12+
}

‎src/function.get_version_from_remote_git.sh‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#!/usr/bin/env bash
2+
3+
get_version_from_remote_git() {
4+
local sProject sRemoteVersion
5+
6+
readonly sProject="${1?One parameter required: <github-project>}"
7+
8+
readonly sRemoteVersion="$("${GIT}" ls-remote --tags "git://github.com/${sProject}.git" \
9+
| cut -d'/' -f3 \
10+
| grep -E '^v?[0-9.]+$' \
11+
| grep -oE '[0-9.]+' \
12+
| sort -V \
13+
| tail -n1)" || true
14+
15+
echo "${sRemoteVersion}"
16+
}

0 commit comments

Comments
 (0)