mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-04-03 20:47:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Minor documentation and script cleanups (#6868)

Browse source 
* Remove mention of no longer used IRC network

Channels exist on matrix, and on libera.chat now.

* Correctly match only files with .png extension

The current search would match files such as 'createpng'.

* Fix comparison in script

The result was always false, due to comparing a literal string instead of a variable.

* Use correct license files from upstream

Correct license files obtained from:
https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
https://www.gnu.org/licenses/gpl-3.0.txt
https://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
https://www.gnu.org/licenses/lgpl-3.0.txt

* Refresh several shell scripts

This fixes several shellcheck warnings, as well as makes the code more
robust and have consistent codestyle between all the files.

* Trim excess whitespace
This commit is contained in:
a1346054 2021-09-21 04:17:46 +00:00 • committed by GitHub
parent 9aec84dee7
commit e3c7b570ae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
29 changed files with 93 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

22
utils/makeappicons.sh
View file

@ -42,22 +42,22 @@ NC='\033[0m'
RED='\033[0;31m'
YELLOW='\033[0;33m'
if [ $# != 1 ];then
if [[ $# != 1 ]]; then
echo "Usage: $0 MATERIAL"
echo "MATERIAL is the directory containing the material icons repository"
echo "(git clone https://github.com/Templarian/MaterialDesign.git)".
exit
fi
MATERIAL="$1"
if [ ! -d "$MATERIAL" ];then
MATERIAL=$1
if [[ ! -d $MATERIAL ]]; then
echo -e "${RED}Material Icons directory does not exist: ${MATERIAL}${NC}"
exit 1
fi
# Check destination dir
DSTDIR=share/icons/application
if [ ! -d "$DSTDIR" ];then
if [[ ! -d $DSTDIR ]]; then
echo -e "${RED}Please invoke this script from the KeePassXC source root directory.${NC}"
exit 1
fi
@ -69,7 +69,7 @@ fi
# extension, e. g. "folder-plus") to stdout.
# If the icon name is unknown, outputs nothing.
map() {
case "$1" in
case $1 in
application-exit) echo exit-run ;;
auto-type) echo keyboard-variant ;;
bugreport) echo bug-outline ;;
@ -148,27 +148,27 @@ map() {
}
# Now do the actual work
find $DSTDIR -type f -name "*.svg" | while read -r DST;do
find "$DSTDIR" -type f -name "*.svg" | while read -r DST; do
# Find the icon name (base name without extender)
NAME=$(basename $DST .svg)
NAME=$(basename "$DST" .svg)
# Find the base name of the svg file for this icon
MAT=$(map $NAME)
if [[ -z $MAT ]];then
MAT=$(map "$NAME")
if [[ -z $MAT ]]; then
echo -e "${YELLOW}Warning: No MaterialDesign mapping for ${NAME}${NC}"
continue
fi
# So the source file is:
SRC="$MATERIAL/svg/$MAT.svg"
if [ ! -f "$SRC" ];then
if [[ ! -f $SRC ]]; then
echo -e "${RED}Error: Source for ${NAME} doesn't exist: ${SRC}${NC}"
continue
fi
# Replace the icon file with the source file
cp "$SRC" "$DST" || exit
cp -- "$SRC" "$DST" || exit
echo "Copied icon for ${NAME}"
done