bryan/installJRMC
1
0
Fork 0
Code Issues Pull Requests Releases 8 Wiki Activity

Trying to fix requires bug

Browse Source
This commit is contained in:
Bryan Roessler
2022-01-07 09:54:32 -05:00
parent d911683bb3
commit 7c9967080e
1 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
installJRMC
View File

@@ -638,23 +638,21 @@ packageTranslations() {
debug "${REQUIRES[@]}" debug "${REQUIRES[@]}"
# Clean up formatting # Clean up formatting
for i in "${!REQUIRES[@]}"; do REQUIRES=("${REQUIRES[@]%%|*}")
REQUIRES[$i]="${REQUIRES[$i]%%|*}" REQUIRES=("${REQUIRES[@]/?:/}")
REQUIRES[$i]="${REQUIRES[$i]/?:/}" REQUIRES=("${REQUIRES[@]# }")
REQUIRES[$i]="${REQUIRES[$i]# }" REQUIRES=("${REQUIRES[@]% }")
REQUIRES[$i]="${REQUIRES[$i]% }" REQUIRES=("${REQUIRES[@]//\(/}")
REQUIRES[$i]="${REQUIRES[$i]//\(/}" REQUIRES=("${REQUIRES[@]//)/}")
REQUIRES[$i]="${REQUIRES[$i]//)/}" RECOMMENDS=("${RECOMMENDS[@]%%|*}")
done RECOMMENDS=("${RECOMMENDS[@]/?:/}")
RECOMMENDS=("${RECOMMENDS[@]# }")
RECOMMENDS=("${RECOMMENDS[@]% }")
RECOMMENDS=("${RECOMMENDS[@]//\(/}")
RECOMMENDS=("${RECOMMENDS[@]//)/}")
for i in "${!RECOMMENDS[@]}"; do debug "Cleaned:"
RECOMMENDS[$i]="${RECOMMENDS[$i]%%|*}" debug "${REQUIRES[@]}"
RECOMMENDS[$i]="${RECOMMENDS[$i]/?:/}"
RECOMMENDS[$i]="${RECOMMENDS[$i]# }"
RECOMMENDS[$i]="${RECOMMENDS[$i]% }"
RECOMMENDS[$i]="${RECOMMENDS[$i]//\(/}"
RECOMMENDS[$i]="${RECOMMENDS[$i]//)/}"
done
# Translate package names # Translate package names
[[ -v BUILD_SUSE_SWITCH ]] && id="opensuse" [[ -v BUILD_SUSE_SWITCH ]] && id="opensuse"
@@ -709,9 +707,6 @@ packageTranslations() {
;; ;;
esac esac
debug "Cleaned:"
debug "${REQUIRES[@]}"
# Remove duplicates # Remove duplicates
for i in "${REQUIRES[@]}"; do for i in "${REQUIRES[@]}"; do
if [[ ! -v dupes[${i%% *}] ]]; then if [[ ! -v dupes[${i%% *}] ]]; then