Commit 6ce9327d authored by Michał Siwek's avatar Michał Siwek

Fix lots of bugs, prepare for first release

parent e6b3e109
...@@ -17,6 +17,8 @@ CREW_DEST_DIR = CREW_BREW_DIR + '/dest' ...@@ -17,6 +17,8 @@ CREW_DEST_DIR = CREW_BREW_DIR + '/dest'
$LOAD_PATH.push CREW_LIB_PATH $LOAD_PATH.push CREW_LIB_PATH
USER = `whoami`.chomp
@device = JSON.parse(File.read(CREW_CONFIG_PATH + 'device.json'), symbolize_names: true) @device = JSON.parse(File.read(CREW_CONFIG_PATH + 'device.json'), symbolize_names: true)
#symbolize also values #symbolize also values
@device.each do |key, elem| @device.each do |key, elem|
...@@ -133,7 +135,7 @@ def install ...@@ -133,7 +135,7 @@ def install
puts "Building from source, this may take a while..." puts "Building from source, this may take a while..."
@pkg.build @pkg.build
system "rm -rf", CREW_DEST_DIR + "/*" #wipe crew destdir system "rm -rf", CREW_DEST_DIR + "/*" #wipe crew destdir
puts "Installing..." puts "Preconfiguring package..."
@pkg.install @pkg.install
end end
...@@ -166,20 +168,18 @@ def install ...@@ -166,20 +168,18 @@ def install
system "mv * ../" system "mv * ../"
end end
end end
puts "Installing..." puts "Installing..."
FileUtils.mv './dlist', CREW_CONFIG_PATH + "meta/#{@pkg.name}.directorylist"
FileUtils.mv './filelist', CREW_CONFIG_PATH + "meta/#{@pkg.name}.filelist"
Dir.chdir CREW_CONFIG_PATH do
File.open("meta/#{@pkg.name}.directorylist").each_line do |line|
system "sudo mkdir", "-p", line.chomp
end
File.open("meta/#{@pkg.name}.filelist").each_line do |line| FileUtils.mv 'dlist', CREW_CONFIG_PATH + "meta/#{@pkg.name}.directorylist"
Dir.chdir CREW_BREW_DIR do FileUtils.mv 'filelist', CREW_CONFIG_PATH + "meta/#{@pkg.name}.filelist"
system "sudo mv", '.' + line.chomp, line.chomp
end File.open(CREW_CONFIG_PATH + "meta/#{@pkg.name}.directorylist").each_line do |line|
end system "sudo", "mkdir", "-p", line.chomp
end
File.open(CREW_CONFIG_PATH + "meta/#{@pkg.name}.filelist").each_line do |line|
system "sudo", "mv", CREW_BREW_DIR + line.chomp, line.chomp
end end
end end
end end
...@@ -203,14 +203,14 @@ def remove ...@@ -203,14 +203,14 @@ def remove
Dir.chdir CREW_CONFIG_PATH do Dir.chdir CREW_CONFIG_PATH do
File.open("meta/#{@pkg.name}.filelist").each_line do |line| File.open("meta/#{@pkg.name}.filelist").each_line do |line|
begin begin
File.unlink '.' + line.chomp File.unlink line.chomp
rescue => exception #swallow exception rescue => exception #swallow exception
end end
end end
File.readlines("meta/#{@pkg.name}.directorylist").reverse.each do |line| File.readlines("meta/#{@pkg.name}.directorylist").reverse.each do |line|
begin begin
Dir.rmdir '.' + line.chomp Dir.rmdir line.chomp
rescue => exception #swallow exception rescue => exception #swallow exception
end end
end end
...@@ -241,6 +241,7 @@ when "install" ...@@ -241,6 +241,7 @@ when "install"
search @pkgName search @pkgName
resolveDependenciesAndInstall resolveDependenciesAndInstall
when "remove" when "remove"
abort 'Removing actions must be ran with sudo.' unless USER == 'root'
search @pkgName search @pkgName
remove remove
when nil when nil
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment