From e3c7b570ae00503bcd5db673eb66b943eec988f0 Mon Sep 17 00:00:00 2001
From: a1346054 <36859588+a1346054@users.noreply.github.com>
Date: Tue, 21 Sep 2021 04:17:46 +0000
Subject: [PATCH] Minor documentation and script cleanups (#6868)
* 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
---
.clang-format | 5 ++---
.github/CONTRIBUTING.md | 2 +-
CHANGELOG.md | 6 +++---
INSTALL.md | 2 +-
LICENSE.GPL-2 | 14 +++++++-------
LICENSE.GPL-3 | 26 ++++++++++++--------------
LICENSE.LGPL-2.1 | 18 +++++++++---------
LICENSE.LGPL-3 | 2 +-
README.md | 2 +-
cmake/CodeCoverage.cmake | 4 ++--
cmake/FindReadline.cmake | 1 -
docs/CMakeLists.txt | 2 +-
docs/topics/AutoType.adoc | 4 ++--
docs/topics/BrowserPlugin.adoc | 4 ++--
docs/topics/Reference.adoc | 2 +-
docs/topics/SSHAgent.adoc | 6 +++---
release-tool | 2 +-
share/icons/minify.sh | 2 +-
share/translations/update.sh | 14 +++++++-------
share/windows/create-ico.sh | 12 ++++++------
share/windows/wix-template.xml | 2 +-
snap/local/launchers/README.md | 1 -
sonar-project.properties | 2 +-
utils/keepassxc-cr-recovery/README.md | 2 +-
utils/keepassxc-kdewallet | 6 +++---
utils/keepassxc-keychain | 6 +++---
utils/keepassxc-snap-helper.sh | 6 +++---
utils/makeappicons.sh | 22 +++++++++++-----------
utils/makedbicons.sh | 14 +++++++-------
29 files changed, 93 insertions(+), 98 deletions(-)
diff --git a/.clang-format b/.clang-format
index 64ab822b6..3c68a1a7a 100644
--- a/.clang-format
+++ b/.clang-format
@@ -19,7 +19,7 @@ AlwaysBreakBeforeMultilineStrings: false
AlwaysBreakTemplateDeclarations: false
BinPackArguments: false
BinPackParameters: false
-BraceWrapping:
+BraceWrapping:
AfterClass: true
AfterFunction: true
AfterControlStatement: false
@@ -44,7 +44,7 @@ DerivePointerAlignment: false
DisableFormat: false
ExperimentalAutoDetectBinPacking: false
ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ]
-IncludeCategories:
+IncludeCategories:
- Regex: '^"(llvm|llvm-c|clang|clang-c)/'
Priority: 2
- Regex: '^(<|"(gtest|isl|json)/)'
@@ -85,4 +85,3 @@ Standard: Cpp11
TabWidth: 4
UseTab: Never
...
-
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index d588bced9..f82b02bf8 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -63,7 +63,7 @@ Before submitting a bug report, check if the problem has already been reported.
### Discuss with the team
-As with feature requests, you can talk to the KeePassXC team about bugs, new features, other issues and pull requests on the dedicated issue tracker, or in the IRC channel on Freenode (`#keepassxc-dev` on `irc.freenode.net`, or use a [webchat link](https://webchat.freenode.net/?channels=%23keepassxc-dev)).
+As with feature requests, you can talk to the KeePassXC team about bugs, new features, other issues and pull requests on the dedicated issue tracker, on the [Matrix development channel](https://matrix.to/#/!RhJPJPGwQIFVQeXqZa:matrix.org?via=matrix.org), or in the IRC channel on Libera.Chat (`#keepassxc-dev` on `irc.libera.chat`, or use a [webchat link](https://web.libera.chat/#keepassxc-dev)).
### Your first code contribution
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c1c36a06e..2651ac999 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -263,7 +263,7 @@
- Return keyboard focus after saving database edits [#4287]
- Windows: Use bare minimum settings in portable version [#4131]
- Windows: Use SHA256 code signing [#4129]
-- macOS: Fix code signing incompatibility in latest macOS release [#4564]
+- macOS: Fix code signing incompatibility in latest macOS release [#4564]
## 2.5.3 (2020-01-19)
@@ -395,8 +395,8 @@
- Redesign database unlock dialog [ #3287]
- Rework the entry preview panel [ #3306]
- Move notes to General tab on Group Preview Panel [#3336]
-- Enable entry actions when editing an entry and cleanup entry context menu [#3641]
-- Improve detection of external database changes [#2389]
+- Enable entry actions when editing an entry and cleanup entry context menu [#3641]
+- Improve detection of external database changes [#2389]
- Warn if user is trying to use a KDBX file as a key file [#3625]
- Add option to disable KeePassHTTP settings migrations prompt [#3349, #3344]
- Re-enabled Wayland support (no Auto-Type yet) [#3520, #3341]
diff --git a/INSTALL.md b/INSTALL.md
index b6f0ac6d0..3c160ea97 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -103,7 +103,7 @@ These steps place the compiled KeePassXC binary inside the `./build/src/` direct
-DWITH_XC_KEESHARE=[ON|OFF] Enable/Disable KeeShare group synchronization extension (default: OFF)
-DWITH_XC_KEESHARE_SECURE=[ON|OFF] Enable/Disable KeeShare signed containers, requires libquazip5 (default: OFF)
-DWITH_XC_ALL=[ON|OFF] Enable/Disable compiling all plugins above (default: OFF)
-
+
-DWITH_XC_UPDATECHECK=[ON|OFF] Enable/Disable automatic updating checking (requires WITH_XC_NETWORKING) (default: ON)
-DWITH_TESTS=[ON|OFF] Enable/Disable building of unit tests (default: ON)
diff --git a/LICENSE.GPL-2 b/LICENSE.GPL-2
index d511905c1..d159169d1 100644
--- a/LICENSE.GPL-2
+++ b/LICENSE.GPL-2
@@ -1,12 +1,12 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
- Preamble
+ Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
@@ -56,7 +56,7 @@ patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
- GNU GENERAL PUBLIC LICENSE
+ GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
@@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
- NO WARRANTY
+ NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
- END OF TERMS AND CONDITIONS
+ END OF TERMS AND CONDITIONS
- How to Apply These Terms to Your New Programs
+ How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
diff --git a/LICENSE.GPL-3 b/LICENSE.GPL-3
index 443254047..f288702d2 100644
--- a/LICENSE.GPL-3
+++ b/LICENSE.GPL-3
@@ -1,12 +1,11 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
- GNU GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc.
+ Copyright (C) 2007 Free Software Foundation, Inc.
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
- Preamble
+ Preamble
The GNU General Public License is a free, copyleft license for
software and other kinds of works.
@@ -69,7 +68,7 @@ patents cannot be used to render the program non-free.
The precise terms and conditions for copying, distribution and
modification follow.
- TERMS AND CONDITIONS
+ TERMS AND CONDITIONS
0. Definitions.
@@ -77,7 +76,7 @@ modification follow.
"Copyright" also means copyright-like laws that apply to other kinds of
works, such as semiconductor masks.
-
+
"The Program" refers to any copyrightable work licensed under this
License. Each licensee is addressed as "you". "Licensees" and
"recipients" may be individuals or organizations.
@@ -510,7 +509,7 @@ actual knowledge that, but for the patent license, your conveying the
covered work in a country, or your recipient's use of the covered work
in a country, would infringe one or more identifiable patents in that
country that you have reason to believe are valid.
-
+
If, pursuant to or in connection with a single transaction or
arrangement, you convey, or propagate by procuring conveyance of, a
covered work, and grant a patent license to some of the parties
@@ -619,9 +618,9 @@ an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee.
- END OF TERMS AND CONDITIONS
+ END OF TERMS AND CONDITIONS
- How to Apply These Terms to Your New Programs
+ How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
@@ -646,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program. If not, see .
+ along with this program. If not, see .
Also add information on how to contact you by electronic and paper mail.
@@ -665,12 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
-.
+.
The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
-.
-
+.
diff --git a/LICENSE.LGPL-2.1 b/LICENSE.LGPL-2.1
index e5ab03e12..4362b4915 100644
--- a/LICENSE.LGPL-2.1
+++ b/LICENSE.LGPL-2.1
@@ -55,7 +55,7 @@ modified by someone else and passed on, the recipients should know
that what they have is not the original version, so that the original
author's reputation will not be affected by problems that might be
introduced by others.
-
+
Finally, software patents pose a constant threat to the existence of
any free program. We wish to make sure that a company cannot
effectively restrict the users of a free program by obtaining a
@@ -111,7 +111,7 @@ modification follow. Pay close attention to the difference between a
"work based on the library" and a "work that uses the library". The
former contains code derived from the library, whereas the latter must
be combined with the library in order to run.
-
+
GNU LESSER GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
@@ -158,7 +158,7 @@ Library.
You may charge a fee for the physical act of transferring a copy,
and you may at your option offer warranty protection in exchange for a
fee.
-
+
2. You may modify your copy or copies of the Library or any portion
of it, thus forming a work based on the Library, and copy and
distribute such modifications or work under the terms of Section 1
@@ -216,7 +216,7 @@ instead of to this License. (If a newer version than version 2 of the
ordinary GNU General Public License has appeared, then you can specify
that version instead if you wish.) Do not make any other change in
these notices.
-
+
Once this change is made in a given copy, it is irreversible for
that copy, so the ordinary GNU General Public License applies to all
subsequent copies and derivative works made from that copy.
@@ -267,7 +267,7 @@ Library will still fall under Section 6.)
distribute the object code for the work under the terms of Section 6.
Any executables containing that work also fall under Section 6,
whether or not they are linked directly with the Library itself.
-
+
6. As an exception to the Sections above, you may also combine or
link a "work that uses the Library" with the Library to produce a
work containing portions of the Library, and distribute that work
@@ -329,7 +329,7 @@ restrictions of other proprietary libraries that do not normally
accompany the operating system. Such a contradiction means you cannot
use both them and the Library together in an executable that you
distribute.
-
+
7. You may place library facilities that are a work based on the
Library side-by-side in a single library together with other library
facilities not covered by this License, and distribute such a combined
@@ -370,7 +370,7 @@ subject to these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties with
this License.
-
+
11. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
@@ -422,7 +422,7 @@ conditions either of that version or of any later version published by
the Free Software Foundation. If the Library does not specify a
license version number, you may choose any version ever published by
the Free Software Foundation.
-
+
14. If you wish to incorporate parts of the Library into other free
programs whose distribution conditions are incompatible with these,
write to the author to ask for permission. For software which is
@@ -456,7 +456,7 @@ SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES.
END OF TERMS AND CONDITIONS
-
+
How to Apply These Terms to Your New Libraries
If you develop a new library, and you want it to be of the greatest
diff --git a/LICENSE.LGPL-3 b/LICENSE.LGPL-3
index 65c5ca88a..0a041280b 100644
--- a/LICENSE.LGPL-3
+++ b/LICENSE.LGPL-3
@@ -1,7 +1,7 @@
GNU LESSER GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
- Copyright (C) 2007 Free Software Foundation, Inc.
+ Copyright (C) 2007 Free Software Foundation, Inc.
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
diff --git a/README.md b/README.md
index d3e74b452..f33293521 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@ Detailed instructions are available in the [Build and Install](./INSTALL.md) pag
## Contributing
-We are always looking for suggestions on how to improve KeePassXC. If you find any bugs or have an idea for a new feature, please let us know by opening a report in the [issue tracker](https://github.com/keepassxreboot/keepassxc/issues) on GitHub or join us on IRC in [freenode](https://webchat.freenode.net/) channels #keepassxc and #keepassxc-dev.
+We are always looking for suggestions on how to improve KeePassXC. If you find any bugs or have an idea for a new feature, please let us know by opening a report in the [issue tracker](https://github.com/keepassxreboot/keepassxc/issues) on GitHub, or join us on [Matrix community channel](https://matrix.to/#/!zUxwGnFkUyycpxeHeM:matrix.org?via=matrix.org) or [Matrix development channel](https://matrix.to/#/!RhJPJPGwQIFVQeXqZa:matrix.org?via=matrix.org), or on IRC in [Libera.Chat](https://web.libera.chat/) channels #keepassxc and #keepassxc-dev.
You may directly contribute your own code by submitting a pull request. Please read the [CONTRIBUTING](.github/CONTRIBUTING.md) document for further information.
diff --git a/cmake/CodeCoverage.cmake b/cmake/CodeCoverage.cmake
index f5287b75b..3dbb3c958 100644
--- a/cmake/CodeCoverage.cmake
+++ b/cmake/CodeCoverage.cmake
@@ -70,7 +70,7 @@ include(CMakeParseArguments)
# Check prereqs
find_program( GCOV_PATH gcov )
-find_program( LCOV_PATH NAMES lcov lcov.bat lcov.exe lcov.perl)
+find_program( LCOV_PATH NAMES lcov lcov.bat lcov.exe lcov.perl)
find_program( GENHTML_PATH NAMES genhtml genhtml.perl genhtml.bat )
find_program( GCOVR_PATH gcovr PATHS ${CMAKE_SOURCE_DIR}/scripts/test)
find_program( SIMPLE_PYTHON_EXECUTABLE python )
@@ -300,4 +300,4 @@ function(APPEND_COVERAGE_COMPILER_FLAGS)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COVERAGE_COMPILER_FLAGS}" PARENT_SCOPE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COVERAGE_COMPILER_FLAGS}" PARENT_SCOPE)
message(STATUS "Appending code coverage compiler flags: ${COVERAGE_COMPILER_FLAGS}")
-endfunction() # APPEND_COVERAGE_COMPILER_FLAGS
\ No newline at end of file
+endfunction() # APPEND_COVERAGE_COMPILER_FLAGS
diff --git a/cmake/FindReadline.cmake b/cmake/FindReadline.cmake
index 9d9691370..6dcdc1dca 100644
--- a/cmake/FindReadline.cmake
+++ b/cmake/FindReadline.cmake
@@ -47,4 +47,3 @@ mark_as_advanced(
Readline_INCLUDE_DIR
Readline_LIBRARY
)
-
diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
index 8dbb81803..db54e5789 100644
--- a/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
@@ -53,7 +53,7 @@ if(UNIX)
VERBATIM)
add_custom_target(manpages ALL DEPENDS keepassxc.1 keepassxc-cli.1)
- install(FILES
+ install(FILES
${OUT_DIR}/keepassxc.1
${OUT_DIR}/keepassxc-cli.1
DESTINATION ${CMAKE_INSTALL_MANDIR}/man1/)
diff --git a/docs/topics/AutoType.adoc b/docs/topics/AutoType.adoc
index 019afd2b2..896278b4f 100644
--- a/docs/topics/AutoType.adoc
+++ b/docs/topics/AutoType.adoc
@@ -80,7 +80,7 @@ Search the unlocked databases by activating Search Database radio button. Use th
.Additional Auto-Type choices
image::autotype_selection_dialog_type_menu.png[,70%]
-The option to type just the username, password, or current TOTP value is available by right clicking the desired row or expanding the Type Sequence button options.
+The option to type just the username, password, or current TOTP value is available by right clicking the desired row or expanding the Type Sequence button options.
=== Performing Entry-Level Auto-Type
You can quickly activate the default Auto-Type sequence for a particular entry using Entry-Level Auto-Type. For this operation, the KeePassXC window will be minimized and the Auto-Type sequence occurs in the previously selected window. You can perform Entry-Level Auto-Type from the toolbar icon *(A)*, entry context menu *(B)*, or by pressing `Ctrl+Shift+V`.
@@ -89,4 +89,4 @@ WARNING: Be careful when using Entry-Level Auto-Type as you can inadvertently ty
.Entry-Level Auto-Type
image::autotype_entrylevel.png[]
-// end::content[]
\ No newline at end of file
+// end::content[]
diff --git a/docs/topics/BrowserPlugin.adoc b/docs/topics/BrowserPlugin.adoc
index 380daf1a5..6d2c26320 100644
--- a/docs/topics/BrowserPlugin.adoc
+++ b/docs/topics/BrowserPlugin.adoc
@@ -48,7 +48,7 @@ image::browser_settings.png[]
.Connect Extension to KeePassXC
image::browser_extension_connect.png[,80%]
-6. Click the _Connect_ button *(B)* in the pop-up window to complete integrating the KeePassXC-Browser extension with your KeePassXC desktop application.
+6. Click the _Connect_ button *(B)* in the pop-up window to complete integrating the KeePassXC-Browser extension with your KeePassXC desktop application.
7. You are now prompted to enter a unique name to identify the connection between this browser and your database. Enter a unique name in the field (e.g., firefox-laptop) and click the _Save and allow access_ button.
+
@@ -62,7 +62,7 @@ The KeePassXC-Browser extension lets you automatically populate the entries from
1. Open your KeePassXC desktop application and unlock your database.
-2. Open your web browser. The KeePassXC-Browser extension icon in your browser window will change based on its connection state. The figure below shows the different states.
+2. Open your web browser. The KeePassXC-Browser extension icon in your browser window will change based on its connection state. The figure below shows the different states.
+
*(A)* KeePassXC is not running or is disconnected +
*(B)* Connected to KeePassXC, but database is locked +
diff --git a/docs/topics/Reference.adoc b/docs/topics/Reference.adoc
index 3a19c23fc..ac9acd1c8 100644
--- a/docs/topics/Reference.adoc
+++ b/docs/topics/Reference.adoc
@@ -48,7 +48,7 @@ This section contains full details on advanced features available in KeePassXC.
|===
=== Entry Cross-Reference
-A reference to another entry's field is possible using the short-hand syntax:
+A reference to another entry's field is possible using the short-hand syntax:
`{REF:@:}`
`` and `` can be one of following:
diff --git a/docs/topics/SSHAgent.adoc b/docs/topics/SSHAgent.adoc
index b46a04c92..265a4ec34 100644
--- a/docs/topics/SSHAgent.adoc
+++ b/docs/topics/SSHAgent.adoc
@@ -70,8 +70,8 @@ Open a terminal window and type the following command to generate a key:
$ ssh-keygen -o -f keepassxc -C johndoe@example
Generating public/private rsa key pair.
- Enter passphrase (empty for no passphrase):
- Enter same passphrase again:
+ Enter passphrase (empty for no passphrase):
+ Enter same passphrase again:
Your identification has been saved in keepassxc
Your public key has been saved in keepassxc.pub
The key fingerprint is:
@@ -110,7 +110,7 @@ The last step is to setup an entry to contain the SSH Agent settings and key fil
1. Create a new entry, or open an existing entry in edit mode.
2. Set the password you used for the key file in the password field.
3. Go to the advanced category and attach the key file you generated previously.
-4. Go to the SSH Agent category *(1)* and select the attachment from the list *(2)*.
+4. Go to the SSH Agent category *(1)* and select the attachment from the list *(2)*.
5. Alternatively, you can load an external file dynamically using the file selection.
6. Choose the options for this key.
7. Press *OK* to accept the entry. Depending on the options you chose, KeePassXC will load the key and present it for use.
diff --git a/release-tool b/release-tool
index 55fb5ef2c..bc5fb56df 100755
--- a/release-tool
+++ b/release-tool
@@ -62,7 +62,7 @@ printUsage() {
cmd="COMMAND"
fi
- printf "\e[1mUsage:\e[0m $(basename $0) $cmd [options]\n"
+ printf "\e[1mUsage:\e[0m $(basename "$0") $cmd [options]\n"
if [ "COMMAND" == "$cmd" ]; then
cat << EOF
diff --git a/share/icons/minify.sh b/share/icons/minify.sh
index 6286031a8..a945c9bb4 100644
--- a/share/icons/minify.sh
+++ b/share/icons/minify.sh
@@ -18,4 +18,4 @@ minify -o icons/database --match=.svg icons/database
# Crush PNG's
echo "Crushing PNG's..."
-find "." -iname '*png' -exec pngcrush -ow -brute {} \;
+find . -iname '*.png' -exec pngcrush -ow -brute {} \;
diff --git a/share/translations/update.sh b/share/translations/update.sh
index fab07fb00..70365c71f 100755
--- a/share/translations/update.sh
+++ b/share/translations/update.sh
@@ -16,23 +16,23 @@
# along with this program. If not, see .
#
-BASEDIR="$(dirname $0)"
+BASEDIR=$(dirname "$0")
PUSH=true
PULL=true
UPDATE=true
-if [ "$1" == "push" ]; then
+if [[ $1 == "push" ]]; then
PULL=false
-elif [ "$1" == "pull" ]; then
+elif [[ $1 == "pull" ]]; then
PUSH=false
UPDATE=false
-elif [ "$1" == "update" ]; then
+elif [[ $1 == "update" ]]; then
PUSH=false
PULL=false
-elif [ "$1" != "" ]; then
+elif [[ $1 != "" ]]; then
echo "Unknown command '${1}'"
- echo "Usage: $(basename $0) [update|pull|push] [additional tx options]"
+ echo "Usage: $(basename "$0") [update|pull|push] [additional tx options]"
exit 1
fi
@@ -45,7 +45,7 @@ if $UPDATE; then
LUPDATE=lupdate-qt5
command -v $LUPDATE > /dev/null
- if [ $? -ne 0 ]; then
+ if [[ $? -ne 0 ]]; then
LUPDATE=lupdate
fi
$LUPDATE -no-ui-lines -disable-heuristic similartext -locations none -no-obsolete src -ts share/translations/keepassx_en.ts
diff --git a/share/windows/create-ico.sh b/share/windows/create-ico.sh
index d78592fe0..746878ce1 100644
--- a/share/windows/create-ico.sh
+++ b/share/windows/create-ico.sh
@@ -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
diff --git a/share/windows/wix-template.xml b/share/windows/wix-template.xml
index 173a11552..6f7be4f8d 100644
--- a/share/windows/wix-template.xml
+++ b/share/windows/wix-template.xml
@@ -61,7 +61,7 @@