forked from CastroFidel/PortWINE
Fixes
This commit is contained in:
parent
0f710f98bc
commit
60cb745fb4
@ -38,28 +38,28 @@ print_wrapped () {
|
|||||||
}
|
}
|
||||||
export -f print_wrapped
|
export -f print_wrapped
|
||||||
|
|
||||||
make_abbreviation () {
|
|
||||||
local words new_word i
|
|
||||||
words=($1)
|
|
||||||
# Создаем новое слово, состоящее из начальных букв слов
|
|
||||||
new_word="${words[0]:0:1}"
|
|
||||||
for ((i=1 ; i<${#words[@]} ; i++)) ; do
|
|
||||||
new_word+="${words[$i]:0:1}"
|
|
||||||
done
|
|
||||||
echo "$new_word"
|
|
||||||
}
|
|
||||||
export -f make_abbreviation
|
|
||||||
|
|
||||||
make_acronym () {
|
make_acronym () {
|
||||||
local word acronym i
|
local words acronym i
|
||||||
word=$1
|
words=($1)
|
||||||
for (( i=0 ; i<${#word} ; i++ )) ; do
|
acronym="${words[0]:0:1}"
|
||||||
if [[ ${word:$i:1} =~ ^[A-Z]$ ]] ; then
|
for ((i=1 ; i<${#words[@]} ; i++)) ; do
|
||||||
acronym+="${word:$i:1}"
|
acronym+="${words[$i]:0:1}"
|
||||||
fi
|
|
||||||
done
|
done
|
||||||
echo "$acronym"
|
echo "$acronym"
|
||||||
}
|
}
|
||||||
|
export -f make_acronym
|
||||||
|
|
||||||
|
make_abbreviation () {
|
||||||
|
local word abbreviation i
|
||||||
|
word=$1
|
||||||
|
for (( i=0 ; i<${#word} ; i++ )) ; do
|
||||||
|
if [[ ${word:$i:1} =~ ^[A-Z]$ ]] ; then
|
||||||
|
abbreviation+="${word:$i:1}"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
echo "$abbreviation"
|
||||||
|
}
|
||||||
|
export -f make_abbreviation
|
||||||
|
|
||||||
check_variables () { [[ -z ${!1} ]] && export $1="$2" ;}
|
check_variables () { [[ -z ${!1} ]] && export $1="$2" ;}
|
||||||
|
|
||||||
@ -960,19 +960,15 @@ create_name_desktop () {
|
|||||||
|
|
||||||
if [[ -n $DESKTOP_NAME_FILE ]] ; then
|
if [[ -n $DESKTOP_NAME_FILE ]] ; then
|
||||||
PW_NAME_DESKTOP_PROXY="$DESKTOP_NAME_FILE"
|
PW_NAME_DESKTOP_PROXY="$DESKTOP_NAME_FILE"
|
||||||
elif [[ -n $DESKTOP_NAME_FILE_OLD ]] ; then
|
elif [[ -n $DESKTOP_NAME_FILE_OLD && ${PORTWINE_DB_DESKTOP^^} =~ ${DESKTOP_NAME_FILE_OLD^^} ]] ; then
|
||||||
PW_NAME_DESKTOP_PROXY="$DESKTOP_NAME_FILE_OLD"
|
PW_NAME_DESKTOP_PROXY="$DESKTOP_NAME_FILE_OLD"
|
||||||
elif [[ -n $PORTPROTON_NAME && ${PORTPROTON_NAME^^} =~ ${PORTWINE_DB_DESKTOP^^} && $PORTPROTON_NAME != "$PORTWINE_DB_DESKTOP" ]] \
|
elif [[ -n $PORTPROTON_NAME && ${PORTPROTON_NAME^^} =~ ${PORTWINE_DB_DESKTOP^^} && $PORTPROTON_NAME != "$PORTWINE_DB_DESKTOP" ]] \
|
||||||
|| [[ -n $PORTPROTON_NAME && ${#PORTPROTON_NAME_ABBR} -gt 2 && ${PORTPROTON_NAME_ABBR^^} =~ ${PORTWINE_DB_DESKTOP^^} ]] \
|
|| [[ -n $PORTPROTON_NAME && ${#PORTPROTON_NAME_ABBR} -gt 2 && ${PORTWINE_DB_DESKTOP^^} =~ $PORTPROTON_NAME_ABBR ]] \
|
||||||
|| [[ -n $PORTPROTON_NAME && ${#PORTPROTON_NAME_ACRO} -gt 2 && ${PORTPROTON_NAME_ACRO^^} =~ ${PORTWINE_DB_DESKTOP^^} ]] \
|
|
||||||
|| [[ -n $PORTPROTON_NAME && ${#PORTPROTON_NAME_ABBR} -gt 2 && ${PORTWINE_DB_DESKTOP^^} =~ ${PORTPROTON_NAME_ABBR^^} ]] \
|
|
||||||
|| [[ -n $PORTPROTON_NAME && ${#PORTPROTON_NAME_ACRO} -gt 2 && ${PORTWINE_DB_DESKTOP^^} =~ ${PORTPROTON_NAME_ACRO^^} ]]
|
|| [[ -n $PORTPROTON_NAME && ${#PORTPROTON_NAME_ACRO} -gt 2 && ${PORTWINE_DB_DESKTOP^^} =~ ${PORTPROTON_NAME_ACRO^^} ]]
|
||||||
then
|
then
|
||||||
PW_NAME_DESKTOP_PROXY="$PORTPROTON_NAME"
|
PW_NAME_DESKTOP_PROXY="$PORTPROTON_NAME"
|
||||||
elif [[ -n $FILE_DESCRIPTION && ${FILE_DESCRIPTION^^} =~ ${PORTWINE_DB_DESKTOP^^} && $FILE_DESCRIPTION != "$PORTWINE_DB_DESKTOP" ]] \
|
elif [[ -n $FILE_DESCRIPTION && ${FILE_DESCRIPTION^^} =~ ${PORTWINE_DB_DESKTOP^^} && $FILE_DESCRIPTION != "$PORTWINE_DB_DESKTOP" ]] \
|
||||||
|| [[ -n $FILE_DESCRIPTION && ${#FILE_DESCRIPTION_ABBR} -gt 2 && ${FILE_DESCRIPTION_ABBR^^} =~ ${PORTWINE_DB_DESKTOP^^} ]] \
|
|| [[ -n $FILE_DESCRIPTION && ${#FILE_DESCRIPTION_ABBR} -gt 2 && ${PORTWINE_DB_DESKTOP^^} =~ $FILE_DESCRIPTION_ABBR ]] \
|
||||||
|| [[ -n $FILE_DESCRIPTION && ${#FILE_DESCRIPTION_ACRO} -gt 2 && ${FILE_DESCRIPTION_ACRO^^} =~ ${PORTWINE_DB_DESKTOP^^} ]] \
|
|
||||||
|| [[ -n $FILE_DESCRIPTION && ${#FILE_DESCRIPTION_ABBR} -gt 2 && ${PORTWINE_DB_DESKTOP^^} =~ ${FILE_DESCRIPTION_ABBR^^} ]] \
|
|
||||||
|| [[ -n $FILE_DESCRIPTION && ${#FILE_DESCRIPTION_ACRO} -gt 2 && ${PORTWINE_DB_DESKTOP^^} =~ ${FILE_DESCRIPTION_ACRO^^} ]]
|
|| [[ -n $FILE_DESCRIPTION && ${#FILE_DESCRIPTION_ACRO} -gt 2 && ${PORTWINE_DB_DESKTOP^^} =~ ${FILE_DESCRIPTION_ACRO^^} ]]
|
||||||
then
|
then
|
||||||
PW_NAME_DESKTOP_PROXY="$FILE_DESCRIPTION"
|
PW_NAME_DESKTOP_PROXY="$FILE_DESCRIPTION"
|
||||||
|
Loading…
Reference in New Issue
Block a user