Commit dba815b0 authored by Fabio Hernandez's avatar Fabio Hernandez
Browse files

Port to MacOS X Yosemite

parent f80cb89d
...@@ -25,10 +25,9 @@ fi ...@@ -25,10 +25,9 @@ fi
# WARNING: make sure we don't overwrite any existing configuration, different # WARNING: make sure we don't overwrite any existing configuration, different
# than ours # than ours
if [ -e /etc/cvmfs/default.local ]; then if [ -e /etc/cvmfs/default.local ]; then
existing=`md5sum /etc/cvmfs/default.local | cut -b1-32` diff "/etc/cvmfs/default.local" "default.local" > /dev/null 2>&1
ours=`md5sum default.local | cut -b1-32` if [ $? -ne 0 ]; then
if [ "$existing" != "$ours" ]; then echo "CernVM FS seems to be already configured in this machine in a potentially incompatible way"
echo "CernVM FS is already configured in this machine in a potentially incompatible way"
echo "see file /etc/cvmfs/default.local" echo "see file /etc/cvmfs/default.local"
exit 1 exit 1
fi fi
...@@ -42,28 +41,33 @@ chmod 0644 /etc/cvmfs/config.d/lsst.in2p3.fr.conf ...@@ -42,28 +41,33 @@ chmod 0644 /etc/cvmfs/config.d/lsst.in2p3.fr.conf
cp lsst.in2p3.fr.pub /etc/cvmfs/keys/lsst.in2p3.fr.pub cp lsst.in2p3.fr.pub /etc/cvmfs/keys/lsst.in2p3.fr.pub
chmod 0444 /etc/cvmfs/keys/lsst.in2p3.fr.pub chmod 0444 /etc/cvmfs/keys/lsst.in2p3.fr.pub
# Check this configuration # On Linux, check this configuration
result=`/usr/bin/cvmfs_config chksetup` thisOS=`uname`
if [ "$result" != "OK" ]; then if [ "$thisOS" == "Linux" ]; then
echo "There was an error checking your CernVM FS configuration:" result=`/usr/bin/cvmfs_config chksetup`
echo $result if [ "$result" != "OK" ]; then
exit 1 echo "There was an error checking your CernVM FS configuration:"
echo $result
exit 1
fi
fi fi
# Check that we can reach the CernVM FS server # Check that we can reach the CernVM FS server
source lsst.in2p3.fr.conf source ./lsst.in2p3.fr.conf
curl -s --proxy $CVMFS_HTTP_PROXY --head $CVMFS_SERVER_URL > /dev/null 2>&1 curl -s --proxy ${CVMFS_HTTP_PROXY} --head ${CVMFS_SERVER_URL} > /dev/null 2>&1
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "Cannot reach repository proxy server: $CVMFS_HTTP_PROXY" echo "Cannot reach repository proxy server: $CVMFS_HTTP_PROXY"
exit 1 exit 1
fi fi
# Restart autofs # On Linux, restart autofs
service autofs restart > /dev/null 2>&1 if [ "$thisOS" == "Linux" ]; then
if [ $? -ne 0 ]; then service autofs restart > /dev/null 2>&1
echo "Could not restart autofs service" if [ $? -ne 0 ]; then
exit 1 echo "Could not restart autofs service"
exit 1
fi
fi fi
# Done # Done
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment