diff --git a/ulo/scripts/isabelle-prepare-directory.sh b/ulo/scripts/isabelle-prepare-directory.sh index 9d76e4aabd25d4399a563e2d51c45b82df82a2e9..f712f4e0143c715d2676e5b4fed73e8a6c32995e 100755 --- a/ulo/scripts/isabelle-prepare-directory.sh +++ b/ulo/scripts/isabelle-prepare-directory.sh @@ -15,10 +15,15 @@ if [ ! $# -eq 1 ]; then exit 1 fi -directory="$1" -threads=6 +directory="$(realpath "$1")" +threads=8 script_dir=$(dirname "$0") cd "$script_dir" -find "$directory" -name "*.rdf.xz" -print0 -exec xargs -0 -P $threads ./isabelle-prepare-file.sh {} \; +# Recurse in $directory and pass each found item to +# isabelle-prepare-file.sh. We use xargs(1) to seep this up by +# exploiting parallelism. +# +# We also run it with niceness 15 as to not annoy other CIP users. +find "$directory" -name "*.rdf.xz" -print0 | nice -n 15 xargs -0 -P $threads -I {} ./isabelle-prepare-file.sh {} diff --git a/ulo/scripts/isabelle-prepare-file.sh b/ulo/scripts/isabelle-prepare-file.sh index e778f7e85e826c783fb7285296208911f3cdbff4..5b23b9ede79fe4ad453a284cc02b0fa3f77e705f 100755 --- a/ulo/scripts/isabelle-prepare-file.sh +++ b/ulo/scripts/isabelle-prepare-file.sh @@ -11,11 +11,11 @@ if [ ! $# -eq 1 ]; then exit 1 fi +file="$(realpath "$1")" + script_dir=$(dirname "$0") cd "$script_dir" -file="$1" - echo "$file" 1>&2 # the filename of the extracted (uncompressed) file diff --git a/ulo/scripts/reset-libraries.sh b/ulo/scripts/reset-libraries.sh index 6f5182d3460c95fd766a24c453999f15db8ee19e..a5da14c668f960d274580e946a60b0dafd948823 100755 --- a/ulo/scripts/reset-libraries.sh +++ b/ulo/scripts/reset-libraries.sh @@ -1,6 +1,6 @@ #! /bin/sh -# reset git submodules in this directory +# Reset git submodules in /ulo/libraries directory set -eu @@ -14,7 +14,7 @@ reset_repo() { base=$(dirname "$0") -reset_repo "$base"/libraries/coq -reset_repo "$base"/libraries/isabelle-distribution -reset_repo "$base"/libraries/isabelle-afp +reset_repo "$base"/../libraries/coq +reset_repo "$base"/../libraries/isabelle-distribution +reset_repo "$base"/../libraries/isabelle-afp