Fix handling of spaces in the --data-dir option