Fixes for clarity and consistency requested by AsciiWolf

- remove grangerhub suffix from binaries
- add fully qualified domain names to icon and desktop
- fix forgotten lines in Makefile from last commit
- In Makefile, remove setting of variable B that causes recursive
processing delay. Instead create a second target for recursive Make
call.
- Change install folder from /opt to $PREFIX/share/

Author: cengique

Diff for: Makefile

@@ -112,7 +112,7 @@ VERSION=1.3.0
 endif
 
 ifndef PACKAGE
-PACKAGE=tremulous-grangerhub
+PACKAGE=tremulous
 endif
 
 ifndef CLIENTBIN
@@ -137,18 +137,18 @@ endif
 
 BASEGAME_CFLAGS=-I../../${MOUNT_DIR}
 
+ifndef PREFIX
+PREFIX=/usr
+endif
+
 ifndef COPYDIR
-COPYDIR="/opt/$(PACKAGE)"
+COPYDIR="$(PREFIX)/share/$(PACKAGE)"
 endif
 
 ifndef COPYBINDIR
 COPYBINDIR=$(COPYDIR)
 endif
 
-ifndef PREFIX
-PREFIX=/usr
-endif
-
 ifndef MOUNT_DIR
 MOUNT_DIR=src
 endif
@@ -273,9 +273,9 @@ BD=$(BUILD_DIR)/debug-$(PLATFORM)-$(ARCH)
 BR=$(BUILD_DIR)/release-$(PLATFORM)-$(ARCH)
 
 # If build target not defined, assume release (for install target)
-ifndef B
-B = $(BR)
-endif
+# ifndef B
+# B=$(BR)
+# endif
 
 CDIR=$(MOUNT_DIR)/client
 SDIR=$(MOUNT_DIR)/server
@@ -1153,6 +1153,9 @@ release:
 	  OPTIMIZE="-DNDEBUG $(OPTIMIZE)" OPTIMIZEVM="-DNDEBUG $(OPTIMIZEVM)" \
 	  CLIENT_CFLAGS="$(CLIENT_CFLAGS)" SERVER_CFLAGS="$(SERVER_CFLAGS)" V=$(V)
 
+install: release
+	@$(MAKE) install_target B=$(BR)
+
 ifneq ($(call bin_path, tput),)
   TERM_COLUMNS=$(shell if c=`tput cols`; then echo $$(($$c-4)); else echo 76; fi)
 else
@@ -2948,19 +2951,26 @@ $(B)/$(SERVERBINSH):
 	@echo './$(SERVERBIN) "$$@"' >> $@
 
 # Install the .desktop, icon files, license, etc.
-install: release
+install_target: 
 ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" "gnu"))
-	$(echo_cmd) "Installing for Linux platform in $(COPYBINDIR) and $(PREFIX)"
-	@$(INSTALL) -d $(PREFIX)/bin "$(PREFIX)/share/metainfo/" \
-			"$(PREFIX)/share/licenses/$(PACKAGE)/" "$(PREFIX)/share/applications/" \
+	$(echo_cmd) "Downloading base Tremulous data and maps"
+	misc/download-paks.sh
+	$(echo_cmd) "Installing for Linux platform in $(PREFIX)"
+	@$(INSTALL) -d $(PREFIX)/bin "$(PREFIX)/share/metainfo" \
+			"$(PREFIX)/share/licenses/$(PACKAGE)" "$(PREFIX)/share/applications" \
 			"$(PREFIX)/share/icons/hicolor/128x128/apps" "$(COPYBINDIR)"
 	@cd $(BR) && for file in $(NAKED_TARGETS); do \
-		$(INSTALL) -D $$file $(COPYBINDIR)/$$file; \
+		if [[ "$$file" == "scripts" ]]; then \
+			$(INSTALL) -d $(COPYBINDIR)/scripts; \
+			$(INSTALL) -t $(COPYBINDIR)/scripts scripts/*; \
+		else \
+			$(INSTALL) -D $$file $(COPYBINDIR)/$$file; \
+		fi \
 	done
-	$(INSTALL) -D -m755 $(BR)/$(CLIENTBINSH) $(PREFIX)/bin/tremulous-grangerhub
-	$(INSTALL) -D -m755 $(BR)/$(SERVERBINSH) $(PREFIX)/bin/tremded-grangerhub
-	$(INSTALL) -D -m644 "misc/Tremulous-Grangerhub.png" "$(PREFIX)/share/icons/hicolor/128x128/apps/"
-	$(INSTALL) -D -m644 "misc/Tremulous-Grangerhub.desktop" \
+	$(INSTALL) -D -m755 $(BR)/$(CLIENTBINSH) $(PREFIX)/bin/tremulous
+	$(INSTALL) -D -m755 $(BR)/$(SERVERBINSH) $(PREFIX)/bin/tremded
+	$(INSTALL) -D -m644 "misc/io.github.grangerhub.Tremulous.png" "$(PREFIX)/share/icons/hicolor/128x128/apps/"
+	$(INSTALL) -D -m644 "misc/io.github.grangerhub.Tremulous.desktop" \
 			 "$(PREFIX)/share/applications/"
 	$(INSTALL) -D -m644 "misc/io.github.grangerhub.Tremulous.appdata.xml" \
 			 "$(PREFIX)/share/metainfo/"

Diff for: misc/download-paks.sh

@@ -32,7 +32,7 @@ for dir in ./build/*; do
         if [[ -e $package ]]; then
             rm -f $package # only want 1 copy
         fi
-        curl -OL $URL/$i
+        curl -OL -C - $URL/$i
     done
 
     popd

Diff for: misc/io.github.grangerhub.Tremulous.appdata.xml

@@ -5,9 +5,9 @@
   <project_license>GPL-2.0</project_license>
   <metadata_license>CC-BY-SA-3.0</metadata_license>
   <provides>
-    <id>tremulous-grangerhub.desktop</id>
+    <id>io.github.grangerhub.Tremulous.desktop</id>
   </provides>
-  <launchable type="desktop-id">Tremulous-Grangerhub.desktop</launchable>
+  <launchable type="desktop-id">io.github.grangerhub.Tremulous.desktop</launchable>
   <name>Tremulous</name>
   <developer_name>Dark Legion Development and GrangerHub</developer_name>
   <summary>Aliens vs Humans, First Person Shooter game with elements of Real Time Strategy (Grangerhub version)</summary>

Diff for: misc/tremulous-grangerhub.desktop renamed to misc/io.github.grangerhub.Tremulous.desktop

@@ -1,7 +1,7 @@
 [Desktop Entry]
-Name=Tremulous Grangerhub
-Comment=Aliens vs Humans, First Person Shooter game with elements of Real Time Strategy (Grangerhub version)
-Icon=tremulous-grangerhub
+Name=Tremulous
+Comment=Aliens vs Humans, First Person Shooter game with elements of Real Time Strategy (GrangerHub version)
+Icon=io.github.grangerhub.Tremulous.png
 Exec=tremulous
 Terminal=false
 Type=Application