Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-09-19 20:34:46 -04: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

12
share/windows/create-ico.sh
View file

@ -4,28 +4,28 @@ NC='\033[0m'
RED='\033[0;31m'
YELLOW='\033[0;33m'
if [[ -z "$1" ]]; then
if [[ -z $1 ]]; then
echo -e "${RED}You must include an SVG file to convert!${NC}"
exit 1
fi
outfile=$2
if [[ -z "outfile" ]]; then
if [[ -z $outfile ]]; then
outfile="logo.ico"
fi
if ! command -v "inkscape" &> /dev/null; then
if ! command -v inkscape &> /dev/null; then
echo -e "${YELLOW}Could not find inkscape; $outfile not built!${NC}"
exit 0
fi
echo "Generating $outfile from $1..."
size_list=(16 24 32 48 64 128 256)
for size in ${size_list[@]}; do
inkscape -z -e $size.png -w $size -h $size "$1" >/dev/null 2>/dev/null
for size in "${size_list[@]}"; do
inkscape -z -e $size.png -w $size -h $size "$1" >/dev/null 2>/dev/null
done
images=`printf "%s.png " "${size_list[@]}"`
images=$(printf "%s.png " "${size_list[@]}")
convert $images $outfile
rm $images

2
share/windows/wix-template.xml
View file

@ -61,7 +61,7 @@
<Directory Id="ProgramMenuFolder">
<Directory Id="ApplicationProgramsFolder" Name="KeePassXC">
<Component Id="ApplicationShortcuts" Guid="*">
<Shortcut Id="ApplicationStartMenuShortcut"
<Shortcut Id="ApplicationStartMenuShortcut"
Name="KeePassXC"
Target="[#CM_FP_KeePassXC.exe]"
WorkingDirectory="INSTALL_ROOT"/>