cupcakearmy/autorestic
1
0
Fork 0
mirror of https://github.com/cupcakearmy/autorestic.git synced 2024-12-22 16:26:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

support for tilde in optional arguments

Browse Source
This commit is contained in:
cupcakearmy 2019-12-21 23:37:44 +01:00
parent 12d2e010bb
commit e51eacf13c
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/utils.ts
View File

@ -1,8 +1,10 @@
import axios from 'axios'
import { spawnSync, SpawnSyncOptions } from 'child_process' import { spawnSync, SpawnSyncOptions } from 'child_process'
import { randomBytes } from 'crypto' import { randomBytes } from 'crypto'
import { createWriteStream } from 'fs' import { createWriteStream } from 'fs'
import { dirname, isAbsolute, resolve } from 'path' import { dirname, isAbsolute, join, resolve } from 'path'
import { homedir } from 'os'
import axios from 'axios'
import { Duration, Humanizer } from 'uhrwerk' import { Duration, Humanizer } from 'uhrwerk'
import { CONFIG_FILE } from './config' import { CONFIG_FILE } from './config'
@ -95,6 +97,11 @@ export const pathRelativeToConfigFile = (path: string): string => isAbsolute(pat
? path ? path
: resolve(dirname(CONFIG_FILE), path) : resolve(dirname(CONFIG_FILE), path)
export const resolveTildePath = (path: string): string | null =>
(path.length === 0 || path[0] !== '~')
? null
: join(homedir(), path.slice(1))
export const ConfigError = new Error('Config file not found') export const ConfigError = new Error('Config file not found')
export const getFlagsFromLocation = (location: Location, command?: string): string[] => { export const getFlagsFromLocation = (location: Location, command?: string): string[] => {
@ -108,8 +115,11 @@ export const getFlagsFromLocation = (location: Location, command?: string): stri
let flags: string[] = [] let flags: string[] = []
// Map the flags to an array for the exec function. // Map the flags to an array for the exec function.
for (let [flag, values] of Object.entries(all)) for (let [flag, values] of Object.entries(all))
for (const value of makeArrayIfIsNot(values)) for (const value of makeArrayIfIsNot(values)) {
flags = [...flags, `--${String(flag)}`, String(value)] const stringValue = String(value)
const resolvedTilde = resolveTildePath(stringValue)
flags = [...flags, `--${String(flag)}`, resolvedTilde === null ? stringValue : resolvedTilde]
}
return flags return flags
} }