diff --git a/data/Makefile b/data/Makefile index dd6e5ea6..8a14eb56 100644 --- a/data/Makefile +++ b/data/Makefile @@ -3,4 +3,4 @@ all: inputs FORCE: inputs: FORCE - $(MAKE) -C inputs + cd inputs ; $(MAKE) all_ezfio diff --git a/data/README.rst b/data/README.rst index 7509694a..4b78b926 100644 --- a/data/README.rst +++ b/data/README.rst @@ -15,14 +15,4 @@ To avoid tracking large binary files with git, only the MD5 digests of the files present in the directory are tracked. Input EZFIO files should be archived using the ``archive_ezfio.sh`` script. The name of the archive will be the md5 digest. -The corresponding files are loaded by running:: - - $ make pull - -And the new files are uploaded with:: - - $ make push - -All previously downloaded files are stored in the ``cache`` directory. - - +The new files are automatically downloaded if not present in the ``cache`` directory. diff --git a/data/inputs/Makefile b/data/inputs/Makefile index dab5075f..fdd82ce5 100644 --- a/data/inputs/Makefile +++ b/data/inputs/Makefile @@ -1,7 +1,7 @@ -all_ezfio: $(shell for i in *.md5 ; do echo $${i/md5/ezfio} ; done) +all_ezfio: $(shell ls *.md5 | sed 's/\.md5/\.ezfio/') @printf '\nCreated EZFIO directories\n' -all_md5: $(shell for i in *.ezfio ; do echo $${i/ezfio/md5} ; done) +all_md5: $(shell ls -d *.ezfio | sed 's/\.ezfio/\.md5/') @printf '\nCreated md5 files\n' FORCE: diff --git a/src/Utils/README.rst b/src/Utils/README.rst index 3b86ea2e..0f51483f 100644 --- a/src/Utils/README.rst +++ b/src/Utils/README.rst @@ -389,6 +389,15 @@ Contains general purpose utilities. + + + + + + + + +