Add LICENSE, fix minor errors1.1

3 files changed, 16 insertions, 3 deletions

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..9ceabba
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,15 @@
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+RuneScape icons are distributed with runescape-launcher-launcher. It is
+believed that these icons are insufficiently original to qualify for copyright,
+or the distribution of them constitutes "de minimis" copying, or the copying is
+permitted under fair use or fair dealing provisions in copyright law.
diff --git a/runescape-launcher-launcher b/runescape-launcher-launcher
index 369b992..50aff81 100755
--- a/runescape-launcher-launcher
+++ b/runescape-launcher-launcher
@@ -4,7 +4,7 @@ set -e
 xdg_data_home=${XDG_DATA_HOME:-$HOME/.local/share}
 rll=$xdg_data_home/runescape-launcher-launcher
 tmpdir=$(mktemp -dt runescape-launcher-launcher.XXXXXXXXXX)
-trap 'echo "cleaning up temporary directory..." >&2; rm -rf "$tmpdir"' INT TERM QUIT EXIT
+trap 'trap "" INT TERM QUIT EXIT; echo "cleaning up temporary directory..." >&2; rm -rf "$tmpdir"' INT TERM QUIT EXIT
 if [ -f "$rll/Packages" ]; then
     echo "checking for runescape-launcher updates..."
 else
@@ -29,7 +29,6 @@ if ! cmp "$rll/Packages" "$tmpdir/Packages" 2>/dev/null; then
     fi
     tar -C "$tmpdir" -xf "$tmpdir/data.tar.xz" ./usr/bin/runescape-launcher ./usr/share/games/runescape-launcher/runescape
     sed -e 's#/usr/share/games/runescape-launcher/#${0%/*}/#' "$tmpdir/usr/bin/runescape-launcher" > "$tmpdir/runescape-launcher"
-    cat
     install -Dm644 "$tmpdir/Packages" "$rll/Packages"
     install -m755 "$tmpdir/runescape-launcher" "$tmpdir/usr/share/games/runescape-launcher/runescape" "$rll/"
 else
diff --git a/runescape-launcher-launcher.desktop b/runescape-launcher-launcher.desktop
index 8f47773..7e1c776 100644
--- a/runescape-launcher-launcher.desktop
+++ b/runescape-launcher-launcher.desktop
@@ -5,7 +5,6 @@ Name=RuneScape
 GenericName=RuneScape
 Comment=RuneScape - A Free MMORPG from Jagex Ltd.
 Icon=runescape
-Terminal=false
 Exec=/usr/bin/runescape-launcher-launcher %u
 Categories=Game;
 MimeType=x-scheme-handler/rs-launch;x-scheme-handler/rs-launchs