Skip to content

Commit

Permalink
Run OSX install script through shellcheck
Browse files Browse the repository at this point in the history
  • Loading branch information
bbockelm committed Jan 24, 2025
1 parent 35326e4 commit c4f024d
Showing 1 changed file with 7 additions and 9 deletions.
16 changes: 7 additions & 9 deletions github_scripts/osx_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ set -ex
# Mac OS X instance in GitHub.
#

scriptdir=$PWD/`dirname $0`

brew install minio ninja coreutils

# The new macos-latest runner has some issues with /usr/local/<lib/include>. Adjust perms ahead of time
Expand All @@ -38,9 +36,9 @@ pushd scitokens-cpp
mkdir build
cd build
export SCITOKENS_CPP_DIR=$PWD/release_dir
cmake .. -GNinja -DCMAKE_INSTALL_PREFIX=$PWD/release_dir
cmake .. -GNinja -DCMAKE_INSTALL_PREFIX="$PWD/release_dir"
ninja install
sudo ln -s $PWD/release_dir/lib/libSciTokens*.dylib /usr/local/lib
sudo ln -s "$PWD"/release_dir/lib/libSciTokens*.dylib /usr/local/lib
popd

# Build XRootD from source
Expand All @@ -59,7 +57,7 @@ git clone --branch v1.0.2 https://github.com/PelicanPlatform/xrdcl-pelican.git
pushd xrdcl-pelican
mkdir build
cd build
cmake .. -GNinja -DCMAKE_INSTALL_PREFIX=$PWD/release_dir
cmake .. -GNinja -DCMAKE_INSTALL_PREFIX="$PWD/release_dir"
ninja install
sudo mkdir -p /etc/xrootd/client.plugins.d/
sudo cp release_dir/etc/xrootd/client.plugins.d/pelican-plugin.conf /etc/xrootd/client.plugins.d/
Expand All @@ -70,13 +68,13 @@ pushd xrootd-s3-http
git checkout v0.1.8
mkdir build
cd build
cmake .. -GNinja -DCMAKE_INSTALL_PREFIX=$PWD/release_dir
cmake .. -GNinja -DCMAKE_INSTALL_PREFIX="$PWD/release_dir"
ninja install
xrootd_libdir=$(grealpath "$(dirname "$(grealpath "$(which xrootd)")")"/../lib/)
echo "Will install into: $xrootd_libdir"
sudo mkdir -p $xrootd_libdir
sudo ln -s $PWD/release_dir/lib/libXrdHTTPServer-5.so $xrootd_libdir
sudo ln -s $PWD/release_dir/lib/libXrdS3-5.so $xrootd_libdir
sudo mkdir -p "$xrootd_libdir"
sudo ln -s "$PWD/release_dir/lib/libXrdHTTPServer-5.so" "$xrootd_libdir"
sudo ln -s "$PWD/release_dir/lib/libXrdS3-5.so" "$xrootd_libdir"
popd

popd
Expand Down

0 comments on commit c4f024d

Please sign in to comment.