Merge pull request #42 from ZJONSSON/home-directory

replace tilde with homedir
ZJONSSON · Jul 19, 2024 · 515f6ff · 515f6ff
2 parents 9c561db + 2ab293a
commit 515f6ff
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "etl-cli",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "",
   "main": "index.js",
   "scripts": {

diff --git a/targets/files.js b/targets/files.js
@@ -7,11 +7,16 @@ const renameAsync = Bluebird.promisify(fs.rename);
 const utimesAsync = Bluebird.promisify(fs.utimes);
 const fstream = require('fstream');
 const convert = require('./lib/convert');
+const path = require('path');
+const os = require('os');
 
 module.exports = async function(stream, argv) {
   const filter_files = argv.filter_files && new RegExp(argv.filter_files);
-  const target_dir = argv.target_dir;
+  let target_dir = argv.target_dir;
   if (!target_dir) throw 'Not target_dir';
+  if (target_dir.startsWith('~')) {
+    target_dir = path.join(os.homedir(), target_dir.slice(1));
+  }
   let files = new Set([]);
 
 
@@ -20,7 +25,7 @@ module.exports = async function(stream, argv) {
     return stream;
   })
     .pipe(etl.map(argv.concurrency || 1, async d => {
-      const Key = `${target_dir}/${d.filename}`;
+      const Key = path.join(target_dir, d.filename);
       if (files.has(Key)) return { message: 'skipping', Key };
       if (filter_files && !filter_files.test(Key)) return { message: 'ignoring', Key };