Rename functions since I gave strange names before.

parent 68bb0396
...@@ -225,7 +225,7 @@ def build_and_preconfigure (target_dir) ...@@ -225,7 +225,7 @@ def build_and_preconfigure (target_dir)
end end
end end
def prepare_packaging (destdir) def prepare_package (destdir)
Dir.chdir destdir do Dir.chdir destdir do
#create directory list #create directory list
system "find . -type f > ../filelist" system "find . -type f > ../filelist"
...@@ -240,7 +240,7 @@ def prepare_packaging (destdir) ...@@ -240,7 +240,7 @@ def prepare_packaging (destdir)
end end
end end
def pkg_install (pkgdir) def install_package (pkgdir)
Dir.chdir pkgdir do Dir.chdir pkgdir do
FileUtils.mv 'dlist', CREW_CONFIG_PATH + "meta/#{@pkg.name}.directorylist" FileUtils.mv 'dlist', CREW_CONFIG_PATH + "meta/#{@pkg.name}.directorylist"
FileUtils.mv 'filelist', CREW_CONFIG_PATH + "meta/#{@pkg.name}.filelist" FileUtils.mv 'filelist', CREW_CONFIG_PATH + "meta/#{@pkg.name}.filelist"
...@@ -340,7 +340,7 @@ def install ...@@ -340,7 +340,7 @@ def install
build_and_preconfigure target_dir build_and_preconfigure target_dir
# prepare filelist and dlist at CREW_DEST_DIR # prepare filelist and dlist at CREW_DEST_DIR
prepare_packaging CREW_DEST_DIR prepare_package CREW_DEST_DIR
# use CREW_DEST_DIR # use CREW_DEST_DIR
dest_dir = CREW_DEST_DIR dest_dir = CREW_DEST_DIR
...@@ -351,7 +351,7 @@ def install ...@@ -351,7 +351,7 @@ def install
# install filelist, dlist and binary files # install filelist, dlist and binary files
puts "Installing..." puts "Installing..."
pkg_install dest_dir install_package dest_dir
end end
#add to installed packages #add to installed packages
......
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