Add more quotes

This commit is contained in:
Richard Berger
2021-04-30 17:52:32 -04:00
parent bebb5c3edf
commit 7994bb320f
7 changed files with 36 additions and 36 deletions

View File

@ -5,7 +5,7 @@ echo "##########################################################################
if [ -z "${LAMMPS_CACHING_DIR}" ] if [ -z "${LAMMPS_CACHING_DIR}" ]
then then
export LAMMPS_CACHING_DIR=$HOME/.cache/lammps export LAMMPS_CACHING_DIR="$HOME/.cache/lammps"
echo "environment variable LAMMPS_CACHING_DIR not set" echo "environment variable LAMMPS_CACHING_DIR not set"
echo "Using default $LAMMPS_CACHING_DIR as cache directory..." echo "Using default $LAMMPS_CACHING_DIR as cache directory..."
else else
@ -17,7 +17,7 @@ CACHE_SCRIPTS_DIR="${SCRIPT_DIR}/scripts"
if [ -z "${LAMMPS_DIR}" ] if [ -z "${LAMMPS_DIR}" ]
then then
export LAMMPS_DIR=$(realpath $SCRIPT_DIR/../../) export LAMMPS_DIR="$(realpath $SCRIPT_DIR/../../)"
echo "environment variable LAMMPS_DIR not set" echo "environment variable LAMMPS_DIR not set"
echo "Using default $LAMMPS_DIR as LAMMPS distribution base directory..." echo "Using default $LAMMPS_DIR as LAMMPS distribution base directory..."
else else
@ -29,14 +29,14 @@ export LOGGING_DIR="$LAMMPS_CACHING_DIR/logs"
export PIP_CACHE_DIR="$LAMMPS_CACHING_DIR/pip" export PIP_CACHE_DIR="$LAMMPS_CACHING_DIR/pip"
export HTTP_CACHE_DIR="$LAMMPS_CACHING_DIR/http" export HTTP_CACHE_DIR="$LAMMPS_CACHING_DIR/http"
mkdir -p $GITHUB_PROXY_DIR mkdir -p "$GITHUB_PROXY_DIR"
mkdir -p $LOGGING_DIR mkdir -p "$LOGGING_DIR"
mkdir -p $PIP_CACHE_DIR mkdir -p "$PIP_CACHE_DIR"
mkdir -p $HTTP_CACHE_DIR mkdir -p "$HTTP_CACHE_DIR"
${CACHE_SCRIPTS_DIR}/init_pip_cache.sh "${CACHE_SCRIPTS_DIR}/init_pip_cache.sh"
${CACHE_SCRIPTS_DIR}/init_git_cache.sh "${CACHE_SCRIPTS_DIR}/init_git_cache.sh"
${CACHE_SCRIPTS_DIR}/init_http_cache.sh "${CACHE_SCRIPTS_DIR}/init_http_cache.sh"
echo "##############################################################################" echo "##############################################################################"
echo echo
echo "To activate:" echo "To activate:"

View File

@ -6,8 +6,8 @@ then
exit 1 exit 1
fi fi
mkdir -p $GITHUB_PROXY_DIR mkdir -p "$GITHUB_PROXY_DIR"
cd $GITHUB_PROXY_DIR cd "$GITHUB_PROXY_DIR"
PROJECTS=( PROJECTS=(
akohlmey/sphinx-fortran akohlmey/sphinx-fortran
@ -16,8 +16,8 @@ PROJECTS=(
for project in ${PROJECTS[@]} for project in ${PROJECTS[@]}
do do
GH_NAMESPACE=$(dirname $project) GH_NAMESPACE="$(dirname $project)"
GH_PROJECT=$(basename $project) GH_PROJECT="$(basename $project)"
mkdir -p $GH_NAMESPACE mkdir -p "$GH_NAMESPACE"
git clone --bare https://github.com/$GH_NAMESPACE/$GH_PROJECT.git $GH_NAMESPACE/$GH_PROJECT.git git clone --bare "https://github.com/$GH_NAMESPACE/$GH_PROJECT.git" "$GH_NAMESPACE/$GH_PROJECT.git"
done done

View File

@ -6,9 +6,9 @@ then
exit 1 exit 1
fi fi
mkdir -p $HTTP_CACHE_DIR mkdir -p "$HTTP_CACHE_DIR"
mkdir -p $HTTP_CACHE_DIR/potentials mkdir -p "$HTTP_CACHE_DIR/potentials"
mkdir -p $HTTP_CACHE_DIR/thirdparty mkdir -p "$HTTP_CACHE_DIR/thirdparty"
cd $HTTP_CACHE_DIR cd $HTTP_CACHE_DIR
LAMMPS_DOWNLOADS_URL="https://download.lammps.org" LAMMPS_DOWNLOADS_URL="https://download.lammps.org"
@ -27,9 +27,9 @@ POTENTIALS=(
echo "Dowloading potentials..." echo "Dowloading potentials..."
for p in ${POTENTIALS[@]} for p in ${POTENTIALS[@]}
do do
if [ ! -f $HTTP_CACHE_DIR/potentials/$p ] if [ ! -f "$HTTP_CACHE_DIR/potentials/$p" ]
then then
wget -O $HTTP_CACHE_DIR/potentials/$p $LAMMPS_POTENTIALS_URL/$p wget -O "$HTTP_CACHE_DIR/potentials/$p" "$LAMMPS_POTENTIALS_URL/$p"
fi fi
done done
@ -85,22 +85,22 @@ TARBALLS=(
############################################################################### ###############################################################################
# generate proxy cmake file to trick CMake to download from local HTTP server # generate proxy cmake file to trick CMake to download from local HTTP server
echo "# auto-generated proxy preset file" > $HTTP_CACHE_DIR/proxy.cmake echo "# auto-generated proxy preset file" > "$HTTP_CACHE_DIR/proxy.cmake"
for t in ${TARBALLS[@]} for t in ${TARBALLS[@]}
do do
FILENAME_VAR=${t/_URL/_FILENAME} FILENAME_VAR="${t/_URL/_FILENAME}"
if [ -z ${!FILENAME_VAR} ] if [ -z "${!FILENAME_VAR}" ]
then then
filename=$(basename ${!t}) filename="$(basename ${!t})"
else else
filename=${!FILENAME_VAR} filename="${!FILENAME_VAR}"
fi fi
if [ ! -f $HTTP_CACHE_DIR/thirdparty/$filename ] if [ ! -f "$HTTP_CACHE_DIR/thirdparty/$filename" ]
then then
wget -O $HTTP_CACHE_DIR/thirdparty/$filename ${!t} wget -O "$HTTP_CACHE_DIR/thirdparty/$filename" "${!t}"
fi fi
echo "set(${t} \"\${LAMMPS_DOWNLOADS_URL}/thirdparty/$filename\" CACHE STRING \"\" FORCE)" >> $HTTP_CACHE_DIR/proxy.cmake echo "set(${t} \"\${LAMMPS_DOWNLOADS_URL}/thirdparty/$filename\" CACHE STRING \"\" FORCE)" >> "$HTTP_CACHE_DIR/proxy.cmake"
done done

View File

@ -14,9 +14,9 @@ fi
set -x set -x
mkdir -p $PIP_CACHE_DIR mkdir -p "$PIP_CACHE_DIR"
# download packages that might be needed # download packages that might be needed
cd $PIP_CACHE_DIR cd "$PIP_CACHE_DIR"
pip3 download pip setuptools wheel pip3 download pip setuptools wheel
pip3 download -r $LAMMPS_DIR/doc/utils/requirements.txt pip3 download -r "$LAMMPS_DIR/doc/utils/requirements.txt"

View File

@ -7,7 +7,7 @@ then
fi fi
export GIT_CONFIG_COUNT=1 export GIT_CONFIG_COUNT=1
export GIT_CONFIG_KEY_0=url.$GITHUB_PROXY_DIR/.insteadOf export GIT_CONFIG_KEY_0="url.$GITHUB_PROXY_DIR/.insteadOf"
export GIT_CONFIG_VALUE_0=git://github.com/ export GIT_CONFIG_VALUE_0=git://github.com/
echo "Redirecting git://github.com urls to local cache..." echo "Redirecting git://github.com urls to local cache..."

View File

@ -24,11 +24,11 @@ then
exit 1 exit 1
fi fi
python3 -m http.server $HTTP_CACHE_PORT --directory $HTTP_CACHE_DIR 2>&1 > ${LOGGING_DIR}/http.log & python3 -m http.server $HTTP_CACHE_PORT --directory "$HTTP_CACHE_DIR" 2>&1 > "${LOGGING_DIR}/http.log" &
export HTTP_CACHE_PID=$! export HTTP_CACHE_PID=$!
export HTTP_CACHE_URL=http://localhost:$HTTP_CACHE_PORT export HTTP_CACHE_URL="http://localhost:$HTTP_CACHE_PORT"
export LAMMPS_HTTP_CACHE_CONFIG=$HTTP_CACHE_DIR/proxy.cmake export LAMMPS_HTTP_CACHE_CONFIG="$HTTP_CACHE_DIR/proxy.cmake"
echo "Running local HTTP cache server on $HTTP_CACHE_URL (pid: $HTTP_CACHE_PID)" echo "Running local HTTP cache server on $HTTP_CACHE_URL (pid: $HTTP_CACHE_PID)"
function deactivate_http_cache { function deactivate_http_cache {

View File

@ -8,7 +8,7 @@ then
fi fi
export PIP_NO_INDEX=1 export PIP_NO_INDEX=1
export PIP_FIND_LINKS=$PIP_CACHE_DIR export PIP_FIND_LINKS="$PIP_CACHE_DIR"
echo "Disabling pip index and use local cache directory..." echo "Disabling pip index and use local cache directory..."