diff --git a/bin/zshrc/init b/bin/zshrc/init index e6acd5c..c32fcf1 100644 --- a/bin/zshrc/init +++ b/bin/zshrc/init @@ -22,6 +22,4 @@ function cdd { . $DAT_ROOT/bin/zshrc/prompt . $DAT_ROOT/bin/zshrc/utils -bindkey '^e' edit-command-line - -export PATH="$HOME/.local/bin:$PATH" +bindkey '^e' edit-command-line \ No newline at end of file diff --git a/lib/make.rb b/lib/make.rb index 1609f01..e36943f 100644 --- a/lib/make.rb +++ b/lib/make.rb @@ -28,7 +28,7 @@ module Make class Context attr_accessor :name, :use_cache, :environment, :steps, :packages, :repository - attr_accessor :target, :archive, :source_type + attr_accessor :target def initialize(options: OpenStruct.new) @target = options.target || :user @@ -52,21 +52,7 @@ module Make # puts makefile @packages = makefile["packages"] || [] - - project_sources = { - repository: makefile["repository"] != nil, - archive: makefile["archive"] != nil - }.select { |_, v| v } - - if project_sources.size == 1 - @source_type = project_sources.keys.first - else - raise "Exactly one type of source: 'repository' or 'archive'" - end - puts @source_type - @repository = Make.rostruct(makefile["repository"] || OpenStruct.new) - @archive = Make.rostruct(makefile["archive"] || OpenStruct.new) @steps = makefile["steps"] || [] @environment = ENV.to_h.merge( @@ -161,14 +147,7 @@ module Make install @context.rpd do | path | @cwd = path - - case @context.source_type - when :repository - checkout - when :archive - download_and_extract - end - + checkout puts "path: #{path}" Dir.chdir(path) @@ -181,13 +160,6 @@ module Make end end end - - def download_and_extract - archive = @context.archive - - puts archive - exit -1 - end def checkout repo_path = @context.local_repo @@ -223,4 +195,4 @@ module Make builder = Builder.new(context) builder.build end -end +end \ No newline at end of file diff --git a/recipes/nginx/generate.rb b/recipes/nginx/generate.rb index cb9f0cc..6f51fd4 100644 --- a/recipes/nginx/generate.rb +++ b/recipes/nginx/generate.rb @@ -3,47 +3,27 @@ require 'erb' class NGINXProxy class << self - attr_accessor :domain, :port, :service, :user + attr_accessor :domain, :port, :service def domain(value = nil) @domain = value unless value.nil? @domain end - def user(value = nil) - @user = value unless value.nil? - @user - end - def port(value = nil) @port = value unless value.nil? @port end - - # This is name of the daemon that will be installed - # This is also master name user as user if not provided + def service(value = nil) @service = value unless value.nil? @service end def generate - template = File.read("proxy.erb") - template = ERB.new(template) - template.result(binding) - end - - def available_path - "/etc/nginx/sites-available/#{service}.#{domain}" - end - - def enabled_path - "/etc/nginx/sites-available/#{service}.#{domain}" - end - - def install - config = generate - File.write + template = File.read("proxy.erb") + template = ERB.new(template) + template.result(binding) end end end @@ -51,9 +31,7 @@ end class ExampleProxy < NGINXProxy domain "gurgul.org" service "forgejo" - user "git" port 3000 end -puts ExampleProxy.generate -puts ExampleProxy.path +puts ExampleProxy.generate \ No newline at end of file