From 7e1245f0bf0ce72159633886fce7dcc7a560e8ed Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Fri, 23 Jun 2023 15:55:56 -0400 Subject: [PATCH] Fix creating deb directory structure --- build/package/deb/MakeInstall | 8 +++----- build/package/deb/install_artifacts.sh | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/build/package/deb/MakeInstall b/build/package/deb/MakeInstall index dff34a53ac..5fad7c1b85 100755 --- a/build/package/deb/MakeInstall +++ b/build/package/deb/MakeInstall @@ -1,10 +1,8 @@ #!/usr/bin/make -f install: - install -d "$(DESTDIR)/opt/tgstation-server" build/package/deb/install_artifacts.sh "$(DESTDIR)" - install -d "$(DESTDIR)/etc/tgstation-server" - install build/package/deb/appsettings.Initial.yml "$(DESTDIR)/etc/tgstation-server/appsettings.Production.yml" - ln -s $(DESTDIR)/etc/tgstation-server/appsettings.Production.yml "$(DESTDIR)/opt/tgstation-server/appsettings.Production.yml" + install -D build/package/deb/appsettings.Initial.yml "$(DESTDIR)/etc/tgstation-server/appsettings.Production.yml" + ln -s "$(DESTDIR)/etc/tgstation-server/appsettings.Production.yml" "$(DESTDIR)/opt/tgstation-server/appsettings.Production.yml" install -d "$(DESTDIR)/usr/bin" - install build/package/deb/tgs-configure "$(DESTDIR)/usr/bin/" + install -D build/package/deb/tgs-configure "$(DESTDIR)/usr/bin/" diff --git a/build/package/deb/install_artifacts.sh b/build/package/deb/install_artifacts.sh index 512447df47..dead938fa2 100755 --- a/build/package/deb/install_artifacts.sh +++ b/build/package/deb/install_artifacts.sh @@ -1,3 +1,3 @@ #!/usr/bin/sh -e -cd artifacts && for f in $(find * -type f); do install "$f" "$1/opt/tgstation-server/$f"; done +cd artifacts && for f in $(find * -type f); do install -D "$f" "$1/opt/tgstation-server/$f"; done