litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

VIVO-262 Complete the push script. Add more checking to extract_files.

Browse source
This commit is contained in:
j2blake 2013-09-13 17:24:59 -04:00
parent 9dcf9d50e1
commit 5b8309bcbc
2 changed files with 62 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

25
utilities/releaseScripts/4_extract_files.rb
View file

@ -21,7 +21,23 @@ require '_common'
#
# Get the VIVO files and the Vitro files, and remove the .git directories.
#
def export_files(vivo_path, vitro_path, tag, export_dir)
def export_files(vivo_path, vitro_path, tag, branch, export_dir)
Dir.chdir(vivo_path) do |path|
cmds = ["git checkout #{branch}",
"git pull",
]
cmds.delete_at(1) unless is_remote_branch?(branch)
approve_and_execute(cmds, "in #{path}")
end
Dir.chdir(vitro_path) do |path|
cmds = ["git checkout #{branch}",
"git pull",
]
cmds.delete_at(1) unless is_remote_branch?(branch)
approve_and_execute(cmds, "in #{path}")
end
approve_and_execute([
"rm -Rf #{File.expand_path("..", export_dir)}",
"mkdir -pv #{export_dir}",
@ -31,6 +47,10 @@ def export_files(vivo_path, vitro_path, tag, export_dir)
])
end
def is_remote_branch?(branch)
! `git branch --list -a origin/#{branch}`.strip.empty?
end
#
# ------------------------------------------------------------------------------------
# Main method
@ -39,6 +59,7 @@ end
begin
tag = Settings.tag_name
branch = Settings.branch_name
vivo_path = Settings.vivo_path
vitro_path = Settings.vitro_path
export_dir = Settings.export_dir
@ -54,7 +75,7 @@ begin
get_permission_and_go(p) do
puts "Building export area"
export_files(vivo_path, vitro_path, tag, export_dir)
export_files(vivo_path, vitro_path, tag, branch, export_dir)
end
rescue BadState
puts "#{$!.message} - Aborting."