aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib/sisu/v4
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sisu/v4')
-rw-r--r--lib/sisu/v4/options.rb19
-rw-r--r--lib/sisu/v4/shared_sisupod_source.rb10
2 files changed, 9 insertions, 20 deletions
diff --git a/lib/sisu/v4/options.rb b/lib/sisu/v4/options.rb
index 6e5f7ca4..724fd9a9 100644
--- a/lib/sisu/v4/options.rb
+++ b/lib/sisu/v4/options.rb
@@ -504,7 +504,7 @@ module SiSU_Commandline
case m
when /^--(?:color-toggle)$/; c=c+'c'
when /^--(?:color-off)$/; c=c+'k'
- when /^--(?:configure|init-site)$/; c=c+'CC'
+ when /^--(?:conf|config|configure|init|initialize|init-site)$/; c=c+'CC'
when /^--(?:dal?|machine|abstraction|abs)$/; c=c+'m'
when /^--(?:txt|text|plaintext)$/; c=c+'t'
when /^--(?:html)$/; c=c+'h'
@@ -606,7 +606,7 @@ module SiSU_Commandline
? { bool: true, set: :on }
: { bool: false, set: :na }
act[:site_init]=(cmd =~/C/ \
- || mod.inspect =~/"--init-site"|"--configure"/) \
+ || mod.inspect =~/"--init"|"--initialize"|"--init-site"|"--conf"|"--config"|"--configure"/) \
? { bool: true, set: :on }
: { bool: false, set: :na }
act[:rc]=if mod.inspect =~/"--rc=/
@@ -1012,7 +1012,6 @@ module SiSU_Commandline
def files_mod
files_mod=files
@files_mod=files_mod
- @files_mod
end
def f_pth
@f_pth
@@ -1030,20 +1029,10 @@ module SiSU_Commandline
@lng_base
end
def fno
- @fno=if @fno \
- and not @fno.empty?
- @fno
- else
- fns[/(.+?(?:sst|ssm))(?:\.sst)?/,1]
- end
+ @fno=fns[/(.+?(?:sst|ssm))(?:\.sst)?/,1]
end
def fng
- @fng=if @fng \
- and not @fng.empty?
- @fng
- else
- fno.gsub(/(?:~(?:#{Px[:lng_lst_rgx]}))?(\.ss[tm])$/,'\1')
- end
+ @fng=fno.gsub(/(?:~(?:#{Px[:lng_lst_rgx]}))?(\.ss[tm])$/,'\1')
end
def fns
@fns
diff --git a/lib/sisu/v4/shared_sisupod_source.rb b/lib/sisu/v4/shared_sisupod_source.rb
index 192648cf..0ec739bb 100644
--- a/lib/sisu/v4/shared_sisupod_source.rb
+++ b/lib/sisu/v4/shared_sisupod_source.rb
@@ -68,13 +68,13 @@ module SiSU_Source
@opt=opt
m=/.+\/(?:src\/)?(\S+)/im
@date=SiSU_Env::InfoDate.new.dt
- @env=SiSU_Env::InfoEnv.new(@opt.fns)
+ @env=SiSU_Env::InfoEnv.new(opt.fns)
@ver=SiSU_Env::InfoVersion.instance.get_version
- @v=(@opt.cmd =~/[VM]/) ? 'v' : ''
+ @v=(opt.cmd =~/[VM]/) ? 'v' : ''
@particulars=SiSU_Particulars::CombinedSingleton.instance.get_all(opt)
@file=@particulars.file
@local_path="#{@file.output_path.sisupod.dir}"
- processing_sisupod=@env.processing_path.processing_sisupod(@opt)
+ processing_sisupod=@env.processing_path.processing_sisupod(opt)
processing_sisupod.make
path_pod=processing_sisupod.paths[:sisupod]
path_pod_fnb=processing_sisupod.paths[:fnb]
@@ -82,8 +82,8 @@ module SiSU_Source
@path_pod={
fnb: path_pod_fnb,
pod: path_pod,
- doc: path_pod + '/' + Gt[:doc] + '/' + @opt.lng,
- po: path_pod + '/' + Gt[:po] + '/' + @opt.lng,
+ doc: path_pod + '/' + Gt[:doc] + '/' + opt.lng,
+ po: path_pod + '/' + Gt[:po] + '/' + opt.lng,
pot: path_pod + '/' + Gt[:pot],
conf: path_pod + '/' + Gt[:conf],
image: path_pod + '/' + Gt[:image],