Skip to content

Commit 00490f1

Browse files
author
Damian Rouson
authored
Merge pull request #345 from sourceryinstitute/issue-340-permission-fix
Issue 340 permission fix
2 parents a0f45a6 + 006a78f commit 00490f1

File tree

6 files changed

+63
-60
lines changed

6 files changed

+63
-60
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,16 @@
88
| --------------------------------- | ---------------------------|
99
| ![Issue Stats][PR response img] | ![Codecov branch][coverage]|
1010

11+
## Summary of changes ##
12+
13+
Summarize what you changed
14+
15+
## Rationale for changes ##
16+
17+
Why did you make these changes?
18+
19+
## Additional info and certifications ##
20+
1121
This pull request (PR) is a:
1222
- [ ] Bug fix
1323
- [ ] Feature addition
@@ -46,13 +56,6 @@ I certify that:
4656
check and following the directions on the CLA assistant webpage
4757
- [ ] I have ensured that the test coverage hasn't gone down and added new [unit tests] to cover an new code added to the library
4858

49-
## Summary of changes ##
50-
51-
Summarize what you changed
52-
53-
## Rationale for changes ##
54-
55-
Why did you make these changes?
5659

5760
## For contributors and SI team members with code review priviledges ##
5861

‎.travis.yml

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@ before_install:
8686
git tag -v ${TRAVIS_TAG}
8787
fi
8888
set +o errexit
89-
-
90-
-
91-
-
89+
-
90+
-
91+
-
9292
- |
9393
set -o errexit
9494
if [[ $TRAVIS ]] && [[ "X$TRAVIS_OS_NAME" = "Xosx" ]]; then
@@ -191,49 +191,49 @@ after_success:
191191
- gcov-6 --version
192192
- bash <(curl -s https://codecov.io/bash) -x $(which gcov-6)
193193

194-
before_deploy:
195-
- git archive -v --prefix "OpenCoarrays-${TRAVIS_TAG}/" -o "OpenCoarrays-${TRAVIS_TAG}.tar.gz" ${TRAVIS_TAG}
196-
- |
197-
echo '# To verify cryptographic checksums `shasum -c opencoarrays-'"${TRAVIS_TAG}"'-SHA256.txt` on Mac OS X,' > "opencoarrays-${TRAVIS_TAG}-SHA256.txt
198-
echo '# `sha256sum -c opencoarrays-'"${TRAVIS_TAG}"'-SHA256.txt` on Linux.' >> "opencoarrays-${TRAVIS_TAG}-SHA256.txt
199-
if [[ "X$(uname -s)" == "XDarwin" ]]; then
200-
shasum -a 256 "OpenCoarrays-${TRAVIS_TAG}.tar.gz" >> "opencoarrays-${TRAVIS_TAG}-SHA256.txt
201-
else
202-
sha256sum "OpenCoarrays-${TRAVIS_TAG}.tar.gz" >> "opencoarrays-${TRAVIS_TAG}-SHA256.txt
203-
fi
204-
- |
205-
set -o errexit
206-
openssl aes-256-cbc -K $encrypted_ef4535c39461_key -iv $encrypted_ef4535c39461_iv -in subkey-328B3A0E-secret.asc.enc -out ./subkey-328B3A0E-secret.asc -d
207-
gpg --allow-secret-key-import --import ./subkey-328B3A0E-secret.asc && rm subkey-328B3A0E-secret.asc
208-
rm subkey-328B3A0E-secret.* || true
209-
unset encrypted_ef4535c39461_key || true
210-
unset encrypted_ef4535c39461_iv || true
211-
gpg --armor --detach-sign -u 328B3A0E --comment 'Mac users can use GPGTools - https://gpgtools.org' \
212-
--comment "Download Izaak Beekman's GPG public key from your" \
213-
--comment 'trusted key server or from' \
214-
--comment 'https://izaakbeekman.com/izaak.pubkey.txt' \
215-
--comment 'Next add it to your GPG keyring, e.g.,' \
216-
--comment '`curl https://izaakbeekman.com/izaak.pubkey.txt | gpg --import`' \
217-
--comment "Make sure you have verified that the release archive's" \
218-
--comment 'SHA256 checksum matches the provided' \
219-
--comment "opencoarrays-${TRAVIS_TAG}-SHA256.txt and ensure that this file" \
220-
--comment "and it's signature are in the same directory. Then" \
221-
--comment 'verify with:' \
222-
--comment '`gpg --verify opencoarrays-'"${TRAVIS_TAG}"'-SHA256.txt.asc`' \
223-
"opencoarrays-${TRAVIS_TAG}-SHA256.txt"
224-
set +o errexit
194+
# before_deploy:
195+
# - git archive -v --prefix "OpenCoarrays-${TRAVIS_TAG}/" -o "OpenCoarrays-${TRAVIS_TAG}.tar.gz" ${TRAVIS_TAG}
196+
# - |
197+
# echo '# To verify cryptographic checksums `shasum -c opencoarrays-'"${TRAVIS_TAG}"'-SHA256.txt` on Mac OS X,' > "opencoarrays-${TRAVIS_TAG}-SHA256.txt
198+
# echo '# `sha256sum -c opencoarrays-'"${TRAVIS_TAG}"'-SHA256.txt` on Linux.' >> "opencoarrays-${TRAVIS_TAG}-SHA256.txt
199+
# if [[ "X$(uname -s)" == "XDarwin" ]]; then
200+
# shasum -a 256 "OpenCoarrays-${TRAVIS_TAG}.tar.gz" >> "opencoarrays-${TRAVIS_TAG}-SHA256.txt
201+
# else
202+
# sha256sum "OpenCoarrays-${TRAVIS_TAG}.tar.gz" >> "opencoarrays-${TRAVIS_TAG}-SHA256.txt
203+
# fi
204+
# - |
205+
# set -o errexit
206+
# openssl aes-256-cbc -K $encrypted_ef4535c39461_key -iv $encrypted_ef4535c39461_iv -in subkey-328B3A0E-secret.asc.enc -out ./subkey-328B3A0E-secret.asc -d
207+
# gpg --allow-secret-key-import --import ./subkey-328B3A0E-secret.asc && rm subkey-328B3A0E-secret.asc
208+
# rm subkey-328B3A0E-secret.* || true
209+
# unset encrypted_ef4535c39461_key || true
210+
# unset encrypted_ef4535c39461_iv || true
211+
# gpg --armor --detach-sign -u 328B3A0E --comment 'Mac users can use GPGTools - https://gpgtools.org' \
212+
# --comment "Download Izaak Beekman's GPG public key from your" \
213+
# --comment 'trusted key server or from' \
214+
# --comment 'https://izaakbeekman.com/izaak.pubkey.txt' \
215+
# --comment 'Next add it to your GPG keyring, e.g.,' \
216+
# --comment '`curl https://izaakbeekman.com/izaak.pubkey.txt | gpg --import`' \
217+
# --comment "Make sure you have verified that the release archive's" \
218+
# --comment 'SHA256 checksum matches the provided' \
219+
# --comment "opencoarrays-${TRAVIS_TAG}-SHA256.txt and ensure that this file" \
220+
# --comment "and it's signature are in the same directory. Then" \
221+
# --comment 'verify with:' \
222+
# --comment '`gpg --verify opencoarrays-'"${TRAVIS_TAG}"'-SHA256.txt.asc`' \
223+
# "opencoarrays-${TRAVIS_TAG}-SHA256.txt"
224+
# set +o errexit
225225

226-
deploy:
227-
provider: releases
228-
api_key:
229-
secure: lBj4VgKhU74xfzPc0CDIji6cFrN/xEQIHLHjMcnDPWEF5JQe79aunMS5qiYu5ttve6khGI1WMFEe7clUO3TXiDUPyRMS4M8B2q3fuvUIsIbYgWcKq7ut+x6+dEQDj4DE3yWpPb8IDugWFp4vno1eQ2Rid1yr6Vn+rjnbE2i6z5SkXPnIv1ziQ9G+TF4ChUA8IOd1T78gJmML86P0rbt6nW8eVuJbza2y1ggHAY//q/b6rrbOFw5PqiOBqZ/BRrKJ5d2U2mvsoZtNn4OYyXw4eKEvNDIydwaIZROXfPRmN9zJ5G7+01QA5jlXpq17KfPBr7MXkn7nrQ5q9Z2ji4hRHk/AFzM/etfl1k4WCshYs13NlORpnU0vZtCMmmmsXWxj2kpsOHLWZQKdUAPs3olMPIG6aVnO5Abk1vrVSNy/ZeknbBTKCGScET1qRSaj6d43ynBwGkqHgaJdLBAwGe0Dpap6SsLGsAg56ZqHTngGlXB1KsbJKMkUsSC5RAgEuh9m55nsMaRlTYTrv+YADAQts7lV8yMCciMeJlrd3EYryyn4ZY1O82eOofhZZ5vQUktbXHtg6YnzguFwQyn+9yY/CQfi/vu2Aoq79NJEO/9UJ82ogn6gOoIebzb0xgIONjw4M68luR2U1CXtibzSYKWLGTeOj43khqZdbOpp6xncIv0=
230-
file:
231-
- "OpenCoarrays-${TRAVIS_TAG}.tar.gz"
232-
- "opencoarrays-${TRAVIS_TAG}-SHA256.txt"
233-
- "opencoarrays-${TRAVIS_TAG}-SHA256.txt.asc"
234-
skip_cleanup: true
235-
on:
236-
tags: true
226+
# deploy:
227+
# provider: releases
228+
# api_key:
229+
# secure: lBj4VgKhU74xfzPc0CDIji6cFrN/xEQIHLHjMcnDPWEF5JQe79aunMS5qiYu5ttve6khGI1WMFEe7clUO3TXiDUPyRMS4M8B2q3fuvUIsIbYgWcKq7ut+x6+dEQDj4DE3yWpPb8IDugWFp4vno1eQ2Rid1yr6Vn+rjnbE2i6z5SkXPnIv1ziQ9G+TF4ChUA8IOd1T78gJmML86P0rbt6nW8eVuJbza2y1ggHAY//q/b6rrbOFw5PqiOBqZ/BRrKJ5d2U2mvsoZtNn4OYyXw4eKEvNDIydwaIZROXfPRmN9zJ5G7+01QA5jlXpq17KfPBr7MXkn7nrQ5q9Z2ji4hRHk/AFzM/etfl1k4WCshYs13NlORpnU0vZtCMmmmsXWxj2kpsOHLWZQKdUAPs3olMPIG6aVnO5Abk1vrVSNy/ZeknbBTKCGScET1qRSaj6d43ynBwGkqHgaJdLBAwGe0Dpap6SsLGsAg56ZqHTngGlXB1KsbJKMkUsSC5RAgEuh9m55nsMaRlTYTrv+YADAQts7lV8yMCciMeJlrd3EYryyn4ZY1O82eOofhZZ5vQUktbXHtg6YnzguFwQyn+9yY/CQfi/vu2Aoq79NJEO/9UJ82ogn6gOoIebzb0xgIONjw4M68luR2U1CXtibzSYKWLGTeOj43khqZdbOpp6xncIv0=
230+
# file:
231+
# - "OpenCoarrays-${TRAVIS_TAG}.tar.gz"
232+
# - "opencoarrays-${TRAVIS_TAG}-SHA256.txt"
233+
# - "opencoarrays-${TRAVIS_TAG}-SHA256.txt.asc"
234+
# skip_cleanup: true
235+
# on:
236+
# tags: true
237237
# repo: sourceryinstitute/opencoarrays
238238

239239
notifications:

‎src/extensions/caf-head

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
#
33
# Coarray Fortran (CAF) Compiler Wrapper
44
#

‎src/extensions/cafrun-head

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
#
33
# Coarray Fortran (CAF) Executable Launcher
44
#

‎src/mpi/CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,15 @@ install(TARGETS caf_mpi EXPORT OpenCoarraysTargets
5858
)
5959

6060
# Install modules to standard include dir, but namespace them with compiler/version
61-
set (mod_install "${CMAKE_INSTALL_FULL_INCLUDEDIR}/OpenCoarrays/${CMAKE_Fortran_COMPILER_ID}/${CMAKE_Fortran_COMPILER_VERSION}")
61+
set (mod_install "OpenCoarrays/${CMAKE_Fortran_COMPILER_ID}/${CMAKE_Fortran_COMPILER_VERSION}")
6262
install(DIRECTORY "${CMAKE_BINARY_DIR}/mod/"
63-
DESTINATION "${mod_install}"
63+
DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/${mod_install}"
6464
FILES_MATCHING PATTERN "*.mod"
6565
)
6666

6767
# Now add a link in standard include dir so that compilers will find by default... this may or may not actually be a good idea...
6868
if ( "${CMAKE_Fortran_COMPILER_ID}" MATCHES "GNU" )
69-
INSTALL(CODE "execute_process( COMMAND ${CMAKE_COMMAND} -E create_symlink ${mod_install}/opencoarrays.mod ${CMAKE_INSTALL_FULL_INCLUDEDIR}/opencoarrays.mod )"
69+
INSTALL(CODE "execute_process( COMMAND ${CMAKE_COMMAND} -E create_symlink ${mod_install}/opencoarrays.mod \$ENV{DESTDIR}${CMAKE_INSTALL_FULL_INCLUDEDIR}/opencoarrays.mod )"
7070
)
7171
endif ()
7272

@@ -76,7 +76,7 @@ set(exe_dir ${CMAKE_BINARY_DIR}/bin_staging)
7676
set(compiler_wrapper ${exe_dir}/caf)
7777
install(
7878
FILES "${compiler_wrapper}"
79-
PERMISSIONS WORLD_EXECUTE WORLD_READ WORLD_WRITE OWNER_EXECUTE OWNER_READ OWNER_WRITE GROUP_EXECUTE GROUP_READ GROUP_WRITE
79+
PERMISSIONS WORLD_EXECUTE WORLD_READ OWNER_EXECUTE OWNER_READ GROUP_EXECUTE GROUP_READ
8080
DESTINATION "${CMAKE_INSTALL_BINDIR}"
8181
)
8282
file(READ ${CMAKE_CURRENT_SOURCE_DIR}/../extensions/caf-head CAF_HEADER)
@@ -109,7 +109,7 @@ file(APPEND "${compiler_wrapper}" "${FOOTER}")
109109
set(caf_launcher ${exe_dir}/cafrun)
110110
install(
111111
FILES "${caf_launcher}"
112-
PERMISSIONS WORLD_EXECUTE WORLD_READ WORLD_WRITE OWNER_EXECUTE OWNER_READ OWNER_WRITE GROUP_EXECUTE GROUP_READ GROUP_WRITE
112+
PERMISSIONS WORLD_EXECUTE WORLD_READ OWNER_EXECUTE OWNER_READ GROUP_EXECUTE GROUP_READ
113113
DESTINATION "${CMAKE_INSTALL_BINDIR}"
114114
)
115115
file(READ ${CMAKE_CURRENT_SOURCE_DIR}/../extensions/cafrun-head CAFRUN_HEADER)

‎src/tests/unit/extensions/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ function(generate_test_script base_name num_images)
3131
endif()
3232
file(APPEND "${harness}" "${CMAKE_INSTALL_PREFIX}/bin/cafrun -np ${num_images} ./${executable}\n")
3333
file( INSTALL "${harness}"
34-
PERMISSIONS WORLD_EXECUTE WORLD_READ W OWNER_EXECUTE OWNER_READ OWNER_WRITE GROUP_EXECUTE GROUP_READ
34+
PERMISSIONS WORLD_EXECUTE WORLD_READ OWNER_EXECUTE OWNER_READ GROUP_EXECUTE GROUP_READ
3535
DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
3636
)
3737

0 commit comments

Comments
 (0)