From efa3fde667ac9702046108c2792a211187d610fa Mon Sep 17 00:00:00 2001 From: Victoria Dye Date: Thu, 5 Aug 2021 13:06:34 -0400 Subject: [PATCH 1/2] deb: add UI helpers to debian package --- src/linux/Packaging.Linux/build.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/linux/Packaging.Linux/build.sh b/src/linux/Packaging.Linux/build.sh index f1c74732c..4435d8077 100755 --- a/src/linux/Packaging.Linux/build.sh +++ b/src/linux/Packaging.Linux/build.sh @@ -172,8 +172,10 @@ Description: Cross Platform Git Credential Manager Core command line utility. For more information see https://aka.ms/gcmcore EOF -# Copy single binary to target installation location +# Copy GCM Core & UI helper binaries to target installation location cp "$PAYLOAD/git-credential-manager-core" "$INSTALL_TO" || exit 1 +cp "$PAYLOAD/Atlassian.Bitbucket.UI" "$INSTALL_TO" || exit 1 +cp "$PAYLOAD/GitHub.UI" "$INSTALL_TO" || exit 1 dpkg-deb --build "$DEBROOT" "$DEBPKG" || exit 1 From 6b6b08be4137a8b600bfbedb68f31c4f10a07d55 Mon Sep 17 00:00:00 2001 From: Victoria Dye Date: Thu, 5 Aug 2021 16:37:10 -0400 Subject: [PATCH 2/2] deb: move binary install location, add symlinks in /usr/bin --- src/linux/Packaging.Linux/build.sh | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/linux/Packaging.Linux/build.sh b/src/linux/Packaging.Linux/build.sh index 4435d8077..5990f045c 100755 --- a/src/linux/Packaging.Linux/build.sh +++ b/src/linux/Packaging.Linux/build.sh @@ -154,8 +154,9 @@ tar -czvf "$SYMTARBALL" * || exit 1 popd # Build .deb -INSTALL_TO="$DEBROOT/usr/bin/" -mkdir -p "$DEBROOT/DEBIAN" "$INSTALL_TO" || exit 1 +INSTALL_TO="$DEBROOT/usr/local/share/gcm-core/" +LINK_TO="$DEBROOT/usr/local/bin/" +mkdir -p "$DEBROOT/DEBIAN" "$INSTALL_TO" "$LINK_TO" || exit 1 # make the debian control file cat >"$DEBROOT/DEBIAN/control" < Description: Cross Platform Git Credential Manager Core command line utility. - GCM Core supports authentication with a number of Git hosting providers - including GitHub, BitBucket, and Azure DevOps. + GCM Core supports authentication with a number of Git hosting providers + including GitHub, BitBucket, and Azure DevOps. For more information see https://aka.ms/gcmcore EOF @@ -177,6 +178,14 @@ cp "$PAYLOAD/git-credential-manager-core" "$INSTALL_TO" || exit 1 cp "$PAYLOAD/Atlassian.Bitbucket.UI" "$INSTALL_TO" || exit 1 cp "$PAYLOAD/GitHub.UI" "$INSTALL_TO" || exit 1 +# Create symlinks +ln -s -r "$INSTALL_TO/git-credential-manager-core" \ + "$LINK_TO/git-credential-manager-core" || exit 1 +ln -s -r "$INSTALL_TO/Atlassian.Bitbucket.UI" \ + "$LINK_TO/Atlassian.Bitbucket.UI" || exit 1 +ln -s -r "$INSTALL_TO/GitHub.UI" \ + "$LINK_TO/GitHub.UI" || exit 1 + dpkg-deb --build "$DEBROOT" "$DEBPKG" || exit 1 echo "Pack complete."