diff options
Diffstat (limited to 'lib/sisu/v3/options.rb')
| -rw-r--r-- | lib/sisu/v3/options.rb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/sisu/v3/options.rb b/lib/sisu/v3/options.rb index 0876604d..82306079 100644 --- a/lib/sisu/v3/options.rb +++ b/lib/sisu/v3/options.rb @@ -397,14 +397,14 @@ module SiSU_Commandline end extra='' if cmd !~/[mn]/ - extra+=if cmd =~/[abegHhIiNOoPpTtwXxyz]/ \ + extra+=if cmd =~/[abegHhIiNOoPpQTtwXxyz]/ \ and cmd !~/[mn]/ 'm' #% add dal elsif ((cmd =~/[Dd]/ \ or (mod.inspect =~/--(?:(?:sq)?lite|pg(?:sql)?)/)) \ and mod.inspect !~/(?:remove|(?:(?:re)?create(?:all)?|dropall|drop)$)/) \ and cmd !~/[mn]/ - 'm' #% add dal + 'm' #% add dal else '' end end @@ -416,14 +416,14 @@ module SiSU_Commandline end end if cmd !~/y/ - extra+=if cmd =~/[abeHhIiNopsSstwXxz]/ \ + extra+=if cmd =~/[abeHhIiNopQsSstwXxz]/ \ and cmd !~/y/ - 'ym' #% add manifest + 'ym' #% add manifest elsif (cmd =~/[Dd]/ \ or mod.inspect =~/--(?:(?:sq)?lite|pg(?:sql)?)/) \ and files[0] !~/^remove$/ \ and cmd !~/y/ - 'ym' #% add manifest + 'ym' #% add manifest else '' end end @@ -675,13 +675,13 @@ module SiSU_Commandline : { bool: false, set: :na } act[:sqlite]=(cmd =~/d/ \ || mod.inspect =~/"--sqlite"/) \ - && (mod.inspect =~/"--createdb"|"--create"|"--recreate"|"--dropall"|"--recreate"|"--import"|"--update"|"--remove"/) \ + && (mod.inspect =~/"--createdb"|"--create(?:all)?"|"--dropall"|"--recreate(?:all)?"|"--import"|"--update"|"--remove"/) \ ? { bool: true, set: :on } : { bool: false, set: :na } act[:sqlite_discreet]=(cmd =~/d/ \ || mod.inspect =~/"--sql"|"--sqlite"/) \ && (mod.inspect =~/"--both"/ \ - || mod.inspect !~/"--createdb"|"--create"|"--recreate"|"--dropall"|"--recreate"|"--import"|"--update"|"--remove"/) \ + || mod.inspect !~/"--createdb"|"--create(?:all)?"|"--dropall"|"--recreate(?:all)?"|"--import"|"--update"|"--remove"/) \ ? { bool: true, set: :on } : { bool: false, set: :na } act[:harvest]=(mod.inspect =~/"--harvest"/) \ |