Skip to content

Commit

Permalink
Install LfMerge binaries with executable bit
Browse files Browse the repository at this point in the history
LfMerge and LfMergeQueueManager are now executable Linux binaries now
that they're compiled with .NET 6, so we need mode 755 for them.
  • Loading branch information
rmunn committed Jun 29, 2022
1 parent 866e823 commit 62c3fd6
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions docker/scripts/create-installation-tarball.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,11 @@ convert=
fixutf8=/${LIB}/MercurialExtensions/fixutf8/fixutf8.py
EOF

chmod +x output/${BUILD}/${FRAMEWORK}/LfMerge
chmod +x output/${BUILD}/${FRAMEWORK}/LfMergeQueueManager

# Install binaries
install -d ${DBDESTDIR}/${LIB}
install -m 644 output/${BUILD}/${FRAMEWORK}/*.* ${DBDESTDIR}/${LIB} 2>/dev/null || install -m 644 output/${BUILD}/*.* ${DBDESTDIR}/${LIB}
install -m 644 output/${BUILD}/${FRAMEWORK}/LfMerge* ${DBDESTDIR}/${LIB} 2>/dev/null || install -m 644 output/${BUILD}/LfMerge* ${DBDESTDIR}/${LIB}
install -m 755 output/${BUILD}/${FRAMEWORK}/LfMerge ${DBDESTDIR}/${LIB} 2>/dev/null || install -m 755 output/${BUILD}/LfMerge ${DBDESTDIR}/${LIB}
install -m 755 output/${BUILD}/${FRAMEWORK}/LfMergeQueueManager ${DBDESTDIR}/${LIB} 2>/dev/null || install -m 755 output/${BUILD}/LfMergeQueueManager ${DBDESTDIR}/${LIB}
install -m 755 output/${BUILD}/${FRAMEWORK}/chorusmerge ${DBDESTDIR}/${LIB} 2>/dev/null || install -m 755 output/${BUILD}/chorusmerge ${DBDESTDIR}/${LIB}
install -d ${DBDESTDIR}/${LIB}/Mercurial
install -d ${DBDESTDIR}/${LIB}/Mercurial/hgext
Expand Down

0 comments on commit 62c3fd6

Please sign in to comment.