Skip to content

Support linux install path from src #1409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ldennington merged 6 commits into from
Oct 19, 2023
Merged

Support linux install path from src #1409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5c50a73
Support linux install path from src
m4ss1m0g Sep 12, 2023
53e2b48
install from source: custom install location edits
ldennington Sep 18, 2023
e66805c
Merge pull request #1 from ldennington/install-from-source-suggestions
m4ss1m0g Sep 19, 2023
3b6b07d
install from source: refactor install location
ldennington Sep 25, 2023
720d347
install from source: correct path addition
ldennington Sep 25, 2023
54f6b46
Merge pull request #2 from ldennington/linux-install-fixes
m4ss1m0g Oct 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/linux/Packaging.Linux/Packaging.Linux.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

<PropertyGroup>
<InstallFromSource>false</InstallFromSource>
<InstallPrefix>/usr/local</InstallPrefix>
</PropertyGroup>

<ItemGroup>
Expand All @@ -23,8 +24,8 @@
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />

<Target Name="CoreCompile" Condition="'$(OSPlatform)'=='linux'">
<Message Text="$(MSBuildProjectDirectory)\build.sh --install-from-source=$(InstallFromSource) --configuration='$(Configuration)' --version='$(Version)'" Importance="High" />
<Exec Command="$(MSBuildProjectDirectory)\build.sh --install-from-source=$(InstallFromSource) --configuration='$(Configuration)' --version='$(Version)'" />
<Message Text="$(MSBuildProjectDirectory)\build.sh --install-from-source=$(InstallFromSource) --configuration='$(Configuration)' --version='$(Version)' --install-prefix='$(InstallPrefix)'" Importance="High" />
<Exec Command="$(MSBuildProjectDirectory)\build.sh --install-from-source=$(InstallFromSource) --configuration='$(Configuration)' --version='$(Version)' --install-prefix='$(InstallPrefix)'" />
</Target>

<Target Name="CoreClean">
Expand Down
18 changes: 12 additions & 6 deletions src/linux/Packaging.Linux/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,21 @@ case "$i" in
INSTALL_FROM_SOURCE="${i#*=}"
shift # past argument=value
;;
--install-prefix=*)
INSTALL_PREFIX="${i#*=}"
shift # past argument=value
;;
*)
# unknown option
;;
esac
done

# Ensure install prefix exists
if [! -d "$INSTALL_PREFIX" ]; then
mkdir -p "$INSTALL_PREFIX"
fi

# Perform pre-execution checks
CONFIGURATION="${CONFIGURATION:=Debug}"
if [ -z "$VERSION" ]; then
Expand All @@ -50,14 +59,11 @@ SYMBOLS="$OUTDIR/payload.sym"
"$INSTALLER_SRC/layout.sh" --configuration="$CONFIGURATION" || exit 1

if [ $INSTALL_FROM_SOURCE = true ]; then
INSTALL_LOCATION="/usr/local"
mkdir -p "$INSTALL_LOCATION"

echo "Installing..."
echo "Installing to $INSTALL_PREFIX"

# Install directories
INSTALL_TO="$INSTALL_LOCATION/share/gcm-core/"
LINK_TO="$INSTALL_LOCATION/bin/"
INSTALL_TO="$INSTALL_PREFIX/share/gcm-core/"
LINK_TO="$INSTALL_PREFIX/bin/"

mkdir -p "$INSTALL_TO" "$LINK_TO"

Expand Down
21 changes: 18 additions & 3 deletions src/linux/Packaging.Linux/install-from-source.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,30 @@ for i in "$@"; do
is_ci=true
shift # Past argument=value
;;
--install-prefix=*)
installPrefix="${i#*=}"
shift # past argument=value
;;
esac
done

# If install-prefix is not passed, use default value
if [ -z "$installPrefix" ]; then
installPrefix=/usr/local
fi

# Ensure install directory exists
if [! -d "$installPrefix" ]; then
echo "The folder $installPrefix does not exist"
exit
fi

# In non-ci scenarios, advertise what we will be doing and
# give user the option to exit.
if [ -z $is_ci ]; then
echo "This script will download, compile, and install Git Credential Manager to:

/usr/local/bin
$installPrefix/bin

Git Credential Manager is licensed under the MIT License: https://aka.ms/gcm/license"

Expand Down Expand Up @@ -225,5 +240,5 @@ if [ -z "$DOTNET_ROOT" ]; then
fi

cd "$toplevel_path"
$sudo_cmd env "PATH=$PATH" $DOTNET_ROOT/dotnet build ./src/linux/Packaging.Linux/Packaging.Linux.csproj -c Release -p:InstallFromSource=true
add_to_PATH "/usr/local/bin"
$sudo_cmd env "PATH=$PATH" $DOTNET_ROOT/dotnet build ./src/linux/Packaging.Linux/Packaging.Linux.csproj -c Release -p:InstallFromSource=true -p:installPrefix=$installPrefix
add_to_PATH "$installPrefix/bin"