Commit 9d90045b authored by Ed Reel's avatar Ed Reel Committed by GitHub

Fix vim packages (#5380)

Add gpm dependency to vim_runtime
parent da8bbcaf
...@@ -27,12 +27,12 @@ class Gvim < Package ...@@ -27,12 +27,12 @@ class Gvim < Package
depends_on 'sommelier' depends_on 'sommelier'
def self.preflight def self.preflight
abort('Please remove libiconv before building.') if File.exist?("#{CREW_LIB_PREFIX}/libcharset.so") vim = `which #{CREW_PREFIX}/bin/vim 2> /dev/null`.chomp
vim = `which vim 2> /dev/null`.chomp
abort "vim version #{version} already installed.".lightgreen unless vim.to_s == '' abort "vim version #{version} already installed.".lightgreen unless vim.to_s == ''
end end
def self.patch def self.patch
abort('Please remove libiconv before building.') if File.exist?("#{CREW_LIB_PREFIX}/libcharset.so")
# set the system-wide vimrc path # set the system-wide vimrc path
FileUtils.cd('src') do FileUtils.cd('src') do
system 'sed', '-i', "s|^.*#define SYS_VIMRC_FILE.*$|#define SYS_VIMRC_FILE \"#{CREW_PREFIX}/etc/vimrc\"|", system 'sed', '-i', "s|^.*#define SYS_VIMRC_FILE.*$|#define SYS_VIMRC_FILE \"#{CREW_PREFIX}/etc/vimrc\"|",
......
...@@ -25,12 +25,12 @@ class Vim < Package ...@@ -25,12 +25,12 @@ class Vim < Package
depends_on 'vim_runtime' depends_on 'vim_runtime'
def self.preflight def self.preflight
abort('Please remove libiconv before building.') if File.exist?("#{CREW_LIB_PREFIX}/libcharset.so") gvim = `which #{CREW_PREFIX}/bin/gvim 2> /dev/null`.chomp
gvim = `which gvim 2> /dev/null`.chomp
abort "gvim version #{version} already installed.".lightgreen unless gvim.to_s == '' abort "gvim version #{version} already installed.".lightgreen unless gvim.to_s == ''
end end
def self.patch def self.patch
abort('Please remove libiconv before building.') if File.exist?("#{CREW_LIB_PREFIX}/libcharset.so")
# set the system-wide vimrc path # set the system-wide vimrc path
FileUtils.cd('src') do FileUtils.cd('src') do
system 'sed', '-i', "s|^.*#define SYS_VIMRC_FILE.*$|#define SYS_VIMRC_FILE \"#{CREW_PREFIX}/etc/vimrc\"|", system 'sed', '-i', "s|^.*#define SYS_VIMRC_FILE.*$|#define SYS_VIMRC_FILE \"#{CREW_PREFIX}/etc/vimrc\"|",
......
...@@ -22,11 +22,10 @@ class Vim_runtime < Package ...@@ -22,11 +22,10 @@ class Vim_runtime < Package
x86_64: '9b8e3d8e1e7455d049000342972c9dfb09ad1fb0b98ef665dde381aa646f9951' x86_64: '9b8e3d8e1e7455d049000342972c9dfb09ad1fb0b98ef665dde381aa646f9951'
}) })
def self.preflight depends_on 'gpm'
abort('Please remove libiconv before building.') if File.exist?("#{CREW_LIB_PREFIX}/libcharset.so")
end
def self.patch def self.patch
abort('Please remove libiconv before building.') if File.exist?("#{CREW_LIB_PREFIX}/libcharset.so")
# set the system-wide vimrc path # set the system-wide vimrc path
FileUtils.cd('src') do FileUtils.cd('src') do
system 'sed', '-i', "s|^.*#define SYS_VIMRC_FILE.*$|#define SYS_VIMRC_FILE \"#{CREW_PREFIX}/etc/vimrc\"|", system 'sed', '-i', "s|^.*#define SYS_VIMRC_FILE.*$|#define SYS_VIMRC_FILE \"#{CREW_PREFIX}/etc/vimrc\"|",
......
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