Fixed the get commit message to right moment, when git repo exists. Fixed depth of repo clone, so we can see more tags. Fixed the tr: write error: Broken pipe.
This commit is contained in:
parent
0280d88699
commit
0e2c3cf5d0
40
src/octozipo
40
src/octozipo
@ -64,8 +64,9 @@ main() {
|
|||||||
# go to folder where zip files are placed
|
# go to folder where zip files are placed
|
||||||
cd "$VDM_ZIP_DIR" || exit 3
|
cd "$VDM_ZIP_DIR" || exit 3
|
||||||
# check that the folder has zip files
|
# check that the folder has zip files
|
||||||
# shellcheck disable=SC2012
|
if [ "$(find . -maxdepth 1 -type f -name "*.zip" | wc -l)" -eq 0 ]; then
|
||||||
[ "$(ls -1 ./*.zip 2>/dev/null | wc -l)" == 0 ] && showError "looking for zip files, since no zip files in the folder $VDM_ZIP_DIR ERROR-NR" 6
|
showError "looking for zip files, since no zip files in the folder $VDM_ZIP_DIR ERROR-NR" 6
|
||||||
|
fi
|
||||||
# get all zip files
|
# get all zip files
|
||||||
for zip_name in *.zip; do
|
for zip_name in *.zip; do
|
||||||
# get a random folder name
|
# get a random folder name
|
||||||
@ -86,7 +87,7 @@ main() {
|
|||||||
if git ls-remote --exit-code --heads "git@${VDM_GIT_URL}:${VDM_ORG}/${VDM_REPO_NAME}.git" "${VDM_REPO_BRANCH}" -q >/dev/null 2>&1; then
|
if git ls-remote --exit-code --heads "git@${VDM_GIT_URL}:${VDM_ORG}/${VDM_REPO_NAME}.git" "${VDM_REPO_BRANCH}" -q >/dev/null 2>&1; then
|
||||||
# check if repo is locally found
|
# check if repo is locally found
|
||||||
cd "${VDM_PATH_REPO}" >/dev/null 2>&1 || {
|
cd "${VDM_PATH_REPO}" >/dev/null 2>&1 || {
|
||||||
git clone --depth 1 "git@${VDM_GIT_URL}:${VDM_ORG}/${VDM_REPO_NAME}.git" \
|
git clone "git@${VDM_GIT_URL}:${VDM_ORG}/${VDM_REPO_NAME}.git" \
|
||||||
--branch "${VDM_REPO_BRANCH}" --single-branch \
|
--branch "${VDM_REPO_BRANCH}" --single-branch \
|
||||||
"${VDM_PATH_REPO}" -q >/dev/null 2>&1
|
"${VDM_PATH_REPO}" -q >/dev/null 2>&1
|
||||||
_echo "[info] Cloned git@${VDM_GIT_URL}:${VDM_ORG}/${VDM_REPO_NAME}.git"
|
_echo "[info] Cloned git@${VDM_GIT_URL}:${VDM_ORG}/${VDM_REPO_NAME}.git"
|
||||||
@ -207,6 +208,13 @@ setExistingRepository() {
|
|||||||
# set repository user details
|
# set repository user details
|
||||||
setUserDetails
|
setUserDetails
|
||||||
|
|
||||||
|
# get commit message
|
||||||
|
VDM_GIT_COMMIT_MESSAGE=$(getGitCommitComment "${VDM_PATH_REPO}/CHANGELOG.md" "v${VDM_VERSION}")
|
||||||
|
_echo "[info] Possible commit message:"
|
||||||
|
_echo "[message]"
|
||||||
|
_echo "${VDM_GIT_COMMIT_MESSAGE}"
|
||||||
|
_echo "[/message]"
|
||||||
|
|
||||||
# make a commit
|
# make a commit
|
||||||
setGitCommit "$VDM_VERSION" "${VDM_GIT_COMMIT_MESSAGE}" || return 4
|
setGitCommit "$VDM_VERSION" "${VDM_GIT_COMMIT_MESSAGE}" || return 4
|
||||||
|
|
||||||
@ -247,6 +255,7 @@ setNewFiles() {
|
|||||||
|
|
||||||
# Notifies the user that the files have been moved to the repository folder.
|
# Notifies the user that the files have been moved to the repository folder.
|
||||||
_echo "[info] Files moved to (${VDM_PATH_REPO})"
|
_echo "[info] Files moved to (${VDM_PATH_REPO})"
|
||||||
|
|
||||||
else
|
else
|
||||||
# Returns an error code of 1 if unable to change to the repository folder.
|
# Returns an error code of 1 if unable to change to the repository folder.
|
||||||
return 1
|
return 1
|
||||||
@ -284,6 +293,13 @@ setGitInit() {
|
|||||||
# set repository user details
|
# set repository user details
|
||||||
setUserDetails
|
setUserDetails
|
||||||
|
|
||||||
|
# get commit message
|
||||||
|
VDM_GIT_COMMIT_MESSAGE=$(getGitCommitComment "${VDM_PATH_REPO}/CHANGELOG.md" "v${VDM_VERSION}")
|
||||||
|
_echo "[info] Possible commit message:"
|
||||||
|
_echo "[message]"
|
||||||
|
_echo "${VDM_GIT_COMMIT_MESSAGE}"
|
||||||
|
_echo "[/message]"
|
||||||
|
|
||||||
# make a commit
|
# make a commit
|
||||||
setGitCommit "$VDM_VERSION" "${VDM_GIT_COMMIT_MESSAGE}" || return 4
|
setGitCommit "$VDM_VERSION" "${VDM_GIT_COMMIT_MESSAGE}" || return 4
|
||||||
fi
|
fi
|
||||||
@ -569,20 +585,12 @@ getPackageDetails() {
|
|||||||
VDM_REPO_BRANCH="master"
|
VDM_REPO_BRANCH="master"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Check if an changelog file
|
|
||||||
env_changelog="${VDM_ZIP_DIR}/${folder_name}/CHANGELOG.md"
|
|
||||||
VDM_GIT_COMMIT_MESSAGE=$(getGitCommitComment "${env_changelog}" "v${VDM_VERSION}")
|
|
||||||
|
|
||||||
_echo "[info] name: $name"
|
_echo "[info] name: $name"
|
||||||
_echo "[info] Repo key name: $env_repo_name"
|
_echo "[info] Repo key name: $env_repo_name"
|
||||||
_echo "[info] Repo name: $VDM_REPO_NAME"
|
_echo "[info] Repo name: $VDM_REPO_NAME"
|
||||||
_echo "[info] Branch key name: ${env_branch:-$env_branch_name}"
|
_echo "[info] Branch key name: ${env_branch:-$env_branch_name}"
|
||||||
_echo "[info] Branch name: $VDM_REPO_BRANCH"
|
_echo "[info] Branch name: $VDM_REPO_BRANCH"
|
||||||
_echo "[info] version: v${VDM_VERSION}"
|
_echo "[info] version: v${VDM_VERSION}"
|
||||||
_echo "[info] Possible commit message:"
|
|
||||||
_echo "[message]"
|
|
||||||
_echo "${VDM_GIT_COMMIT_MESSAGE}"
|
|
||||||
_echo "[/message]"
|
|
||||||
|
|
||||||
# Clear the `env_xxx` variable.
|
# Clear the `env_xxx` variable.
|
||||||
unset env_name
|
unset env_name
|
||||||
@ -690,9 +698,7 @@ function getGitCommitComment() {
|
|||||||
# a random string with the specified length
|
# a random string with the specified length
|
||||||
function getRandomName() {
|
function getRandomName() {
|
||||||
# simple basic random
|
# simple basic random
|
||||||
# shellcheck disable=SC2046
|
head -c "${1:-16}" < <(tr -dc 'A-HJ-NP-Za-km-z' </dev/urandom)
|
||||||
# shellcheck disable=SC2005
|
|
||||||
echo $(tr -dc 'A-HJ-NP-Za-km-z' </dev/urandom | dd bs="${1:-128}" count=1 status=none)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# getRepoName - Get the repository name for a package.
|
# getRepoName - Get the repository name for a package.
|
||||||
@ -741,7 +747,7 @@ function getRepoName() {
|
|||||||
name="${name//\-/ }"
|
name="${name//\-/ }"
|
||||||
|
|
||||||
# Remove all double spaces.
|
# Remove all double spaces.
|
||||||
name=$(echo "${name}" | tr -s "[:blank:]" | xargs)
|
name=$(echo "${name}" | tr -s "[:blank:]" | xargs < <(cat))
|
||||||
|
|
||||||
# Convert all spaces to the specified spacer.
|
# Convert all spaces to the specified spacer.
|
||||||
name="${name//[[:space:]]/$VDM_SPACER}"
|
name="${name//[[:space:]]/$VDM_SPACER}"
|
||||||
@ -835,8 +841,8 @@ function _unzip() {
|
|||||||
local folder_name="${2}"
|
local folder_name="${2}"
|
||||||
|
|
||||||
# Unzip the contents of the `zip_name` file to the specified `folder_name`.
|
# Unzip the contents of the `zip_name` file to the specified `folder_name`.
|
||||||
# Redirect stdout and stderr to /dev/null to suppress output.
|
# Use process substitution to pass the output of `unzip` to `cat`.
|
||||||
if unzip "$VDM_ZIP_DIR/$zip_name" -d "$VDM_ZIP_DIR/$folder_name" >/dev/null 2>&1; then
|
if cat < <(unzip "$VDM_ZIP_DIR/$zip_name" -d "$VDM_ZIP_DIR/$folder_name") >/dev/null 2>&1; then
|
||||||
_echo "[info] Successfully unzipped the package ($zip_name)"
|
_echo "[info] Successfully unzipped the package ($zip_name)"
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
|
Loading…
x
Reference in New Issue
Block a user