Skip to content

Commit ef862d6

Browse files
authored
Merge pull request #648 from ldennington/fix-linux-compile
2 parents b00c732 + 4c0fa3a commit ef862d6

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

src/linux/Packaging.Linux/build.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ if [ $INSTALL_FROM_SOURCE = false ]; then
181181

182182
# Build .deb
183183
INSTALL_TO="$DEBROOT/usr/local/share/gcm-core/"
184-
LINK_TO="$DEBROOT/usr/bin/"
184+
LINK_TO="$DEBROOT/usr/local/bin/"
185185
mkdir -p "$DEBROOT/DEBIAN" "$INSTALL_TO" "$LINK_TO" || exit 1
186186

187187
# make the debian control file
@@ -201,8 +201,6 @@ Description: Cross Platform Git Credential Manager command line utility.
201201
including GitHub, BitBucket, and Azure DevOps.
202202
For more information see https://aka.ms/gcm
203203
EOF
204-
205-
dpkg-deb --build "$DEBROOT" "$DEBPKG" || exit 1
206204
else
207205
echo "Installing..."
208206

@@ -217,10 +215,14 @@ mkdir -p "$INSTALL_TO" "$LINK_TO"
217215
# Copy all binaries and shared libraries to target installation location
218216
cp -R "$PAYLOAD"/* "$INSTALL_TO" || exit 1
219217

218+
if [ $INSTALL_FROM_SOURCE = false ]; then
219+
dpkg-deb --build "$DEBROOT" "$DEBPKG" || exit 1
220+
fi
221+
220222
# Create symlink
221223
if [ ! -f "$LINK_TO/git-credential-manager-core" ]; then
222224
ln -s -r "$INSTALL_TO/git-credential-manager-core" \
223225
"$LINK_TO/git-credential-manager-core" || exit 1
224226
fi
225227

226-
echo $MESSAGE
228+
echo $MESSAGE

0 commit comments

Comments
 (0)