[type/__dtnrch_etax_sgnp] Support for old and new versions and their .desktop locations

1 files changed, 36 insertions, 5 deletions

diff --git a/type/__dtnrch_etax_sgnp/gencode-remote b/type/__dtnrch_etax_sgnp/gencode-remote
index a35de8e..83dc039 100755
--- a/type/__dtnrch_etax_sgnp/gencode-remote
+++ b/type/__dtnrch_etax_sgnp/gencode-remote
@@ -55,14 +55,45 @@ then
 	cat <<-EOF
 	set -e
 
+	i4j_desktop_file=\$(echo '${install_dir}'/.install4j/install4j_*-Steuer*.desktop)
 	desktop_file=\$(echo '${install_dir}'/Steuer\ *.desktop)
-	test -e "\${desktop_file}" || {
+
+	if test -e "\${i4j_desktop_file}" && test -e "\${desktop_file}"
+	then
+	    cmp -s "\${i4j_desktop_file}" "\${desktop_file}" || {
+	        echo 'Found regular and install4j .desktop file, but they differ!' >&2
+	        exit 1
+	    }
+
+	    main_desktop_file=\${i4j_desktop_file}
+	    alt_desktop_file=\${desktop_file}
+	elif test -e "\${i4j_desktop_file}"
+	then
+	    main_desktop_file=\${i4j_desktop_file}
+	elif test -e "\${desktop_file}"
+	then
+	    main_desktop_file=\${desktop_file}
+	else
 	    echo 'Could not find .desktop file.' >&2
 	    exit 1
-	}
+	fi
+
+	sed -i -n '/^MimeType=/!p' "\${main_desktop_file}"
+	printf 'MimeType=%s\n' 'application/x-sgnp${version}' >>"\${main_desktop_file}"
 
-	sed -i -n '/^MimeType=/!p' "\${desktop_file}"
-	printf 'MimeType=%s\n' 'application/x-sgnp${version}' >>"\${desktop_file}"
-	xdg-desktop-menu install --mode system "\${desktop_file}"
+	# Update alt file if they're not symlinked (i.e. they differ)
+	cmp -s "\${main_desktop_file}" "\${alt_desktop_file}" \
+	|| cat "\${main_desktop_file}" >"\${alt_desktop_file}"
+
+	desktop_basename=\${main_desktop_file##*/}
+	cp "\${main_desktop_file}"
+	chown 0:0 "/usr/share/applications/\${desktop_basename}"
+	chmod 0755 "/usr/share/applications/\${desktop_basename}"
+
+	update-desktop-database
 	EOF
+
+	# NOTE:
+	# xdg-desktop-menu install --mode system "\${main_desktop_file}"
+	# only works for files with no spaces
 fi