diff --git a/packages/bcif.rb b/packages/bcif.rb index 5b84e97d5..a939c3fe9 100644 --- a/packages/bcif.rb +++ b/packages/bcif.rb @@ -30,8 +30,8 @@ class Bcif < Package def self.install FileUtils.cd('Cpp') do - system "mkdir -p #{CREW_DEST_DIR}/usr/local/bin" - system "cp bcif #{CREW_DEST_DIR}/usr/local/bin" + system "mkdir -p #{CREW_DEST_PREFIX}/bin" + system "cp bcif #{CREW_DEST_PREFIX}/bin" end end end diff --git a/packages/cdrkit.rb b/packages/cdrkit.rb index 959bc53d4..8e0b624e4 100644 --- a/packages/cdrkit.rb +++ b/packages/cdrkit.rb @@ -25,7 +25,7 @@ class Cdrkit < Package def self.build system 'make clean' - system 'make CFLAGS=-I/usr/local/include LDFLAGS=-L/usr/local/lib' + system "make CFLAGS='-I#{CREW_PREFIX}/include' LDFLAGS='-L#{CREW_LIB_PREFIX}'" end def self.install diff --git a/packages/darkhttpd.rb b/packages/darkhttpd.rb index 4f54f2e30..979b22056 100644 --- a/packages/darkhttpd.rb +++ b/packages/darkhttpd.rb @@ -25,7 +25,7 @@ class Darkhttpd < Package end def self.install - FileUtils.mkdir_p "#{CREW_DEST_DIR}/usr/local/bin" - FileUtils.cp 'darkhttpd', "#{CREW_DEST_DIR}/usr/local/bin/" + FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/bin" + FileUtils.cp 'darkhttpd', "#{CREW_DEST_PREFIX}/bin/" end end diff --git a/packages/diffutils.rb b/packages/diffutils.rb index 652f2a6b4..a23db55a9 100644 --- a/packages/diffutils.rb +++ b/packages/diffutils.rb @@ -23,7 +23,7 @@ class Diffutils < Package depends_on 'libsigsegv' def self.build - system "./configure --prefix=/usr/local" + system "./configure --prefix=#{CREW_PREFIX}" system "make" end diff --git a/packages/dos2unix.rb b/packages/dos2unix.rb index b1f73237c..beb1be25f 100644 --- a/packages/dos2unix.rb +++ b/packages/dos2unix.rb @@ -27,10 +27,10 @@ class Dos2unix < Package end def self.install - system "mkdir -p #{CREW_DEST_DIR}/usr/local/bin" - system "cp dos2unix #{CREW_DEST_DIR}/usr/local/bin" - system "cp mac2unix #{CREW_DEST_DIR}/usr/local/bin" - system "cp unix2dos #{CREW_DEST_DIR}/usr/local/bin" - system "cp unix2mac #{CREW_DEST_DIR}/usr/local/bin" + system "mkdir -p #{CREW_DEST_PREFIX}/bin" + system "cp dos2unix #{CREW_DEST_PREFIX}/bin" + system "cp mac2unix #{CREW_DEST_PREFIX}/bin" + system "cp unix2dos #{CREW_DEST_PREFIX}/bin" + system "cp unix2mac #{CREW_DEST_PREFIX}/bin" end end diff --git a/packages/dropbox_uploader.rb b/packages/dropbox_uploader.rb index 9ef23c2b3..4f49f7282 100644 --- a/packages/dropbox_uploader.rb +++ b/packages/dropbox_uploader.rb @@ -26,9 +26,9 @@ class Dropbox_uploader < Package system "sed -i 's,dropbox_uploader.sh,dropbox_uploader,g' dropShell.sh" system "chmod +x dropShell.sh" system "chmod +x dropbox_uploader.sh" - system "mkdir -p #{CREW_DEST_DIR}/usr/local/bin" - system "cp dropShell.sh #{CREW_DEST_DIR}/usr/local/bin/dropshell" - system "cp dropbox_uploader.sh #{CREW_DEST_DIR}/usr/local/bin/dropbox_uploader" + system "mkdir -p #{CREW_DEST_PREFIX}/bin" + system "cp dropShell.sh #{CREW_DEST_PREFIX}/bin/dropshell" + system "cp dropbox_uploader.sh #{CREW_DEST_PREFIX}/bin/dropbox_uploader" puts "" puts "Type 'dropbox_uploader' and follow the instructions to finish the installation.".lightblue puts "To execute The Interactive Dropbox SHELL, type 'dropshell'.".lightblue diff --git a/packages/dstat.rb b/packages/dstat.rb index ef793841a..102bde388 100644 --- a/packages/dstat.rb +++ b/packages/dstat.rb @@ -26,6 +26,6 @@ class Dstat < Package end def self.install - system "make", "prefix=/usr/local", "DESTDIR=#{CREW_DEST_DIR}", "install" + system "make", "prefix=#{CREW_PREFIX}", "DESTDIR=#{CREW_DEST_DIR}", "install" end end diff --git a/packages/dtrx.rb b/packages/dtrx.rb index 7a16eea97..496c23e75 100644 --- a/packages/dtrx.rb +++ b/packages/dtrx.rb @@ -31,8 +31,8 @@ class Dtrx < Package depends_on 'unzip' def self.install - system "python setup.py install --prefix=/usr/local" - system "mkdir -p #{CREW_DEST_DIR}/usr/local/bin" - system "cp /usr/local/bin/dtrx #{CREW_DEST_DIR}/usr/local/bin" + system "python setup.py install --prefix=#{CREW_PREFIX}" + system "mkdir -p #{CREW_DEST_PREFIX}/bin" + system "cp #{CREW_PREFIX}/bin/dtrx #{CREW_DEST_PREFIX}/bin" end end diff --git a/packages/fetch.rb b/packages/fetch.rb index fefb9c114..0e8fe707e 100644 --- a/packages/fetch.rb +++ b/packages/fetch.rb @@ -29,7 +29,7 @@ class Fetch < Package end def self.install - system "mkdir -p #{CREW_DEST_DIR}/usr/local/bin" - system "go build -ldflags \"-X main.VERSION=v0.1.1\" -o #{CREW_DEST_DIR}/usr/local/bin/fetch" + system "mkdir -p #{CREW_DEST_PREFIX}/bin" + system "go build -ldflags \"-X main.VERSION=v0.1.1\" -o #{CREW_DEST_PREFIX}/bin/fetch" end end diff --git a/packages/figlet.rb b/packages/figlet.rb index cb6dac047..1ffb30bd0 100644 --- a/packages/figlet.rb +++ b/packages/figlet.rb @@ -21,7 +21,7 @@ class Figlet < Package }) def self.build - system "make", "PREFIX=/usr/local" + system "make", "PREFIX=#{CREW_PREFIX}" end def self.install diff --git a/packages/finch.rb b/packages/finch.rb index 72f8ec75e..54444819f 100644 --- a/packages/finch.rb +++ b/packages/finch.rb @@ -27,7 +27,7 @@ class Finch < Package depends_on 'gnutls' def self.build - system "sed -i 's,/usr/include,/usr/local/include,g' configure" + system "sed -i 's,/usr/include,#{CREW_PREFIX}/include,g' configure" system './configure', '--disable-avahi', '--disable-dbus', diff --git a/packages/fly.rb b/packages/fly.rb index 51f78fa8a..6187086bc 100644 --- a/packages/fly.rb +++ b/packages/fly.rb @@ -27,7 +27,7 @@ class Fly < Package end def self.install - system "mkdir -p #{CREW_DEST_DIR}/usr/local/bin" - system "cp fly #{CREW_DEST_DIR}/usr/local/bin" + system "mkdir -p #{CREW_DEST_PREFIX}/bin" + system "cp fly #{CREW_DEST_PREFIX}/bin" end end diff --git a/packages/foremost.rb b/packages/foremost.rb index 0afdbe443..cdb5de56b 100644 --- a/packages/foremost.rb +++ b/packages/foremost.rb @@ -25,11 +25,11 @@ class Foremost < Package end def self.install - FileUtils.mkdir_p ["#{CREW_DEST_DIR}/usr/local/bin", \ - "#{CREW_DEST_DIR}/usr/local/man/man1", \ - "#{CREW_DEST_DIR}/usr/local/etc"] - FileUtils.cp_r 'foremost', "#{CREW_DEST_DIR}/usr/local/bin/" - FileUtils.cp_r 'foremost.8.gz', "#{CREW_DEST_DIR}/usr/local/man/man1/foremost.1.gz" - FileUtils.cp_r 'foremost.conf', "#{CREW_DEST_DIR}/usr/local/etc/" + FileUtils.mkdir_p ["#{CREW_DEST_PREFIX}/bin", \ + "#{CREW_DEST_PREFIX}/man/man1", \ + "#{CREW_DEST_PREFIX}/etc"] + FileUtils.cp_r 'foremost', "#{CREW_DEST_PREFIX}/bin/" + FileUtils.cp_r 'foremost.8.gz', "#{CREW_DEST_PREFIX}/man/man1/foremost.1.gz" + FileUtils.cp_r 'foremost.conf', "#{CREW_DEST_PREFIX}/etc/" end end diff --git a/packages/fslint.rb b/packages/fslint.rb index 955dca8d1..0e4432471 100644 --- a/packages/fslint.rb +++ b/packages/fslint.rb @@ -41,10 +41,10 @@ class Fslint < Package end def self.install - system "mkdir -p #{CREW_DEST_DIR}/usr/local/bin" - system "mkdir -p #{CREW_DEST_DIR}/usr/local/man/man1" - system "cp -r fslint/* #{CREW_DEST_DIR}/usr/local/bin" - system "cp fslint/fstool/lS #{CREW_DEST_DIR}/usr/local/bin" - system "cp man/* #{CREW_DEST_DIR}/usr/local/man/man1" + system "mkdir -p #{CREW_DEST_PREFIX}/bin" + system "mkdir -p #{CREW_DEST_PREFIX}/man/man1" + system "cp -r fslint/* #{CREW_DEST_PREFIX}/bin" + system "cp fslint/fstool/lS #{CREW_DEST_PREFIX}/bin" + system "cp man/* #{CREW_DEST_PREFIX}/man/man1" end end diff --git a/packages/gcc7.rb b/packages/gcc7.rb index 57c765166..f3f55cc96 100644 --- a/packages/gcc7.rb +++ b/packages/gcc7.rb @@ -37,8 +37,8 @@ class Gcc7 < Package def self.build # previous compile issue - # /usr/local/bin/ld: cannot find crti.o: No such file or directory - # /usr/local/bin/ld: cannot find /usr/lib64/libc_nonshared.a + # #{CREW_PREFIX}/bin/ld: cannot find crti.o: No such file or directory + # #{CREW_PREFIX}/bin/ld: cannot find /usr/lib64/libc_nonshared.a ENV["LIBRARY_PATH"] = "#{CREW_LIB_PREFIX}" # fix x86_64 issues system "mkdir -p objdir" Dir.chdir("objdir") do @@ -127,7 +127,7 @@ class Gcc7 < Package # http://www.linuxfromscratch.org/lfs/view/development/chapter06/gcc.html#contents-gcc # move a misplaced file - # The installation stage puts some files used by gdb under the /usr/local/lib(64) directory. This generates spurious error messages when performing ldconfig. This command moves the files to another location. + # The installation stage puts some files used by gdb under the #{CREW_LIB_PREFIX} directory. This generates spurious error messages when performing ldconfig. This command moves the files to another location. system "mkdir -pv #{CREW_DEST_PREFIX}/share/gdb/auto-load/usr/lib" system "mv -v #{CREW_DEST_LIB_PREFIX}/*gdb.py #{CREW_DEST_PREFIX}/share/gdb/auto-load/usr/lib" diff --git a/packages/gdrive.rb b/packages/gdrive.rb index 41259623b..31e2e598b 100644 --- a/packages/gdrive.rb +++ b/packages/gdrive.rb @@ -22,25 +22,25 @@ class Gdrive < Package }) def self.install - system "mkdir -p #{CREW_DEST_DIR}/usr/local/bin" + system "mkdir -p #{CREW_DEST_PREFIX}/bin" case ARCH when 'aarch64' - system "wget -L -O #{CREW_DEST_DIR}/usr/local/bin/gdrive https://docs.google.com/uc?id=0B3X9GlR6EmbnRjBaMVVLalN4cTA&export=download" + system "wget -L -O #{CREW_DEST_PREFIX}/bin/gdrive https://docs.google.com/uc?id=0B3X9GlR6EmbnRjBaMVVLalN4cTA&export=download" system "sleep 10" - abort 'Checksum mismatch. :/ Try again.'.lightred unless Digest::SHA256.hexdigest( File.read("#{CREW_DEST_DIR}/usr/local/bin/gdrive") ) == '25eb74f892785bfd7c93ec22e63dfce04fd68298d8449ea1473bdbf90e3aaf35' + abort 'Checksum mismatch. :/ Try again.'.lightred unless Digest::SHA256.hexdigest( File.read("#{CREW_DEST_PREFIX}/bin/gdrive") ) == '25eb74f892785bfd7c93ec22e63dfce04fd68298d8449ea1473bdbf90e3aaf35' when 'armv7l' - system "wget -L -O #{CREW_DEST_DIR}/usr/local/bin/gdrive https://docs.google.com/uc?id=0B3X9GlR6EmbnRjBaMVVLalN4cTA&export=download" + system "wget -L -O #{CREW_DEST_PREFIX}/bin/gdrive https://docs.google.com/uc?id=0B3X9GlR6EmbnRjBaMVVLalN4cTA&export=download" system "sleep 10" - abort 'Checksum mismatch. :/ Try again.'.lightred unless Digest::SHA256.hexdigest( File.read("#{CREW_DEST_DIR}/usr/local/bin/gdrive") ) == '25eb74f892785bfd7c93ec22e63dfce04fd68298d8449ea1473bdbf90e3aaf35' + abort 'Checksum mismatch. :/ Try again.'.lightred unless Digest::SHA256.hexdigest( File.read("#{CREW_DEST_PREFIX}/bin/gdrive") ) == '25eb74f892785bfd7c93ec22e63dfce04fd68298d8449ea1473bdbf90e3aaf35' when 'i686' - system "wget -L -O #{CREW_DEST_DIR}/usr/local/bin/gdrive https://docs.google.com/uc?id=0B3X9GlR6EmbnLV92dHBpTkFhTEU&export=download" + system "wget -L -O #{CREW_DEST_PREFIX}/bin/gdrive https://docs.google.com/uc?id=0B3X9GlR6EmbnLV92dHBpTkFhTEU&export=download" system "sleep 10" - abort 'Checksum mismatch. :/ Try again.'.lightred unless Digest::SHA256.hexdigest( File.read("#{CREW_DEST_DIR}/usr/local/bin/gdrive") ) == '768103053ebe56d5b6e17396ac208db85a3b1968d19e9cac9172fe56b6b8cad2' + abort 'Checksum mismatch. :/ Try again.'.lightred unless Digest::SHA256.hexdigest( File.read("#{CREW_DEST_PREFIX}/bin/gdrive") ) == '768103053ebe56d5b6e17396ac208db85a3b1968d19e9cac9172fe56b6b8cad2' when 'x86_64' - system "wget -L -O #{CREW_DEST_DIR}/usr/local/bin/gdrive https://docs.google.com/uc?id=0B3X9GlR6EmbnQ0FtZmJJUXEyRTA&export=download" + system "wget -L -O #{CREW_DEST_PREFIX}/bin/gdrive https://docs.google.com/uc?id=0B3X9GlR6EmbnQ0FtZmJJUXEyRTA&export=download" system "sleep 10" - abort 'Checksum mismatch. :/ Try again.'.lightred unless Digest::SHA256.hexdigest( File.read("#{CREW_DEST_DIR}/usr/local/bin/gdrive") ) == 'f31b441c5cdb835ee69849a62856e35c17954fd5b600f6de8a6f5d7bd7bf0420' + abort 'Checksum mismatch. :/ Try again.'.lightred unless Digest::SHA256.hexdigest( File.read("#{CREW_DEST_PREFIX}/bin/gdrive") ) == 'f31b441c5cdb835ee69849a62856e35c17954fd5b600f6de8a6f5d7bd7bf0420' end - system "chmod +x #{CREW_DEST_DIR}/usr/local/bin/gdrive" + system "chmod +x #{CREW_DEST_PREFIX}/bin/gdrive" end end diff --git a/packages/get_iplayer.rb b/packages/get_iplayer.rb index 877aeb51e..a2692b34c 100644 --- a/packages/get_iplayer.rb +++ b/packages/get_iplayer.rb @@ -55,7 +55,7 @@ class Get_iplayer < Package end def self.install - system "mkdir -p #{CREW_DEST_DIR}/usr/local/bin" - system "cp get_iplayer #{CREW_DEST_DIR}/usr/local/bin/" + system "mkdir -p #{CREW_DEST_PREFIX}/bin" + system "cp get_iplayer #{CREW_DEST_PREFIX}/bin/" end end diff --git a/packages/gifgen.rb b/packages/gifgen.rb index 80580fc00..bc1065a7c 100644 --- a/packages/gifgen.rb +++ b/packages/gifgen.rb @@ -25,9 +25,9 @@ class Gifgen < Package def self.install system "help2man -N ./gifgen > gifgen.1" - system "mkdir -p #{CREW_DEST_DIR}/usr/local/bin" - system "mkdir -p #{CREW_DEST_DIR}/usr/local/man/man1" - system "cp gifgen #{CREW_DEST_DIR}/usr/local/bin" - system "cp gifgen.1 #{CREW_DEST_DIR}/usr/local/man/man1" + system "mkdir -p #{CREW_DEST_PREFIX}/bin" + system "mkdir -p #{CREW_DEST_PREFIX}/man/man1" + system "cp gifgen #{CREW_DEST_PREFIX}/bin" + system "cp gifgen.1 #{CREW_DEST_PREFIX}/man/man1" end end diff --git a/packages/github_release.rb b/packages/github_release.rb index 19b805ab8..83ae0f4b0 100644 --- a/packages/github_release.rb +++ b/packages/github_release.rb @@ -27,7 +27,7 @@ class Github_release < Package end def self.install - system "mkdir -p #{CREW_DEST_DIR}/usr/local/bin" - system "cp github-release #{CREW_DEST_DIR}/usr/local/bin" + system "mkdir -p #{CREW_DEST_PREFIX}/bin" + system "cp github-release #{CREW_DEST_PREFIX}/bin" end end diff --git a/packages/glibc.rb b/packages/glibc.rb index d818642ee..9844d5a56 100644 --- a/packages/glibc.rb +++ b/packages/glibc.rb @@ -121,7 +121,7 @@ class Glibc < Package end end - # minimum set of locales -> /usr/local/lib(64)/locale/locale-archive + # minimum set of locales -> #{CREW_LIB_PREFIX}/locale/locale-archive Dir.chdir "glibc_build/localedata" do system "mkdir -pv #{CREW_DEST_LIB_PREFIX}/locale" puts "Install minimum set of locales".lightblue diff --git a/packages/go.rb b/packages/go.rb index 81cb40d82..c46c352a3 100644 --- a/packages/go.rb +++ b/packages/go.rb @@ -31,7 +31,7 @@ class Go < Package FileUtils.cd('src') do # install with go_bootstrap if go is not in the path unless File.exist? "#{CREW_PREFIX}/share/go/bin/go" - system "GOROOT_BOOTSTRAP=#{CREW_PREFIX}/lib/go_bootstrap/go \ + system "GOROOT_BOOTSTRAP=#{CREW_PREFIX}/share/go_bootstrap/go \ TMPDIR=#{CREW_PREFIX}/tmp \ GOROOT_FINAL=#{CREW_PREFIX}/share/go \ ./make.bash" @@ -49,7 +49,7 @@ class Go < Package system "mkdir", "-p", dest FileUtils.cp_r Dir.pwd, dest - # make a symbolic link for /usr/local/bin/{go,gofmt} + # make a symbolic link for #{CREW_PREFIX}/bin/{go,gofmt} system "mkdir", "-p", "#{CREW_DEST_PREFIX}/bin" system "ln", "-s", "#{CREW_PREFIX}/share/go/bin/go", "#{CREW_DEST_PREFIX}/bin" system "ln", "-s", "#{CREW_PREFIX}/share/go/bin/gofmt", "#{CREW_DEST_PREFIX}/bin" diff --git a/packages/go_bootstrap.rb b/packages/go_bootstrap.rb index 81fd0493c..0460452f2 100644 --- a/packages/go_bootstrap.rb +++ b/packages/go_bootstrap.rb @@ -3,35 +3,27 @@ require 'package' class Go_bootstrap < Package description 'Bootstrap tool chain for the Go programming language.' homepage 'https://golang.org/' - version '1.4' + version '1.4-0' source_url 'https://storage.googleapis.com/golang/go1.4-bootstrap-20161024.tar.gz' source_sha256 '398c70d9d10541ba9352974cc585c43220b6d8dbcd804ba2c9bd2fbf35fab286' binary_url ({ - aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/go_bootstrap-1.4-chromeos-armv7l.tar.xz', - armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/go_bootstrap-1.4-chromeos-armv7l.tar.xz', - i686: 'https://dl.bintray.com/chromebrew/chromebrew/go_bootstrap-1.4-chromeos-i686.tar.xz', - x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/go_bootstrap-1.4-chromeos-x86_64.tar.xz', }) binary_sha256 ({ - aarch64: '8156807070467d81cbcc55cd89c499c22e845aae77b5e114fffe595d86819fda', - armv7l: '8156807070467d81cbcc55cd89c499c22e845aae77b5e114fffe595d86819fda', - i686: '8f3df69651d3100a7e86161e8c36d9d6a04484247ad3912922044cb3a6f1f0f1', - x86_64: '16ca50af6bf7b909cab2db4dc2527af782610f081b8717a9f343e81365007a16', }) def self.build FileUtils.cd('src') do - system "TMPDIR=/usr/local/tmp ./make.bash" + system "TMPDIR=#{CREW_PREFIX}/tmp ./make.bash" end end def self.install - dest = "#{CREW_DEST_DIR}/usr/local/lib/go_bootstrap" + dest = "#{CREW_DEST_PREFIX}/share/go_bootstrap" system "mkdir", "-p", dest FileUtils.mv Dir.pwd, dest puts "--------" - puts "Installed Go_bootstrap for #{ARCH} in /usr/local/lib/go_bootstrap" + puts "Installed Go_bootstrap for #{ARCH} in #{CREW_PREFIX}/share/go_bootstrap" end end diff --git a/packages/gox.rb b/packages/gox.rb index 91e1bdc8b..0ce447ec3 100644 --- a/packages/gox.rb +++ b/packages/gox.rb @@ -24,7 +24,7 @@ class Gox < Package def self.install system "go get github.com/mitchellh/iochan" - system "mkdir -p #{CREW_DEST_DIR}/usr/local/bin" - system "go build -o #{CREW_DEST_DIR}/usr/local/bin/gox" + system "mkdir -p #{CREW_DEST_PREFIX}/bin" + system "go build -o #{CREW_DEST_PREFIX}/bin/gox" end end diff --git a/packages/gsettings_desktop_schemas.rb b/packages/gsettings_desktop_schemas.rb index 0a418d060..fbfdf6e41 100644 --- a/packages/gsettings_desktop_schemas.rb +++ b/packages/gsettings_desktop_schemas.rb @@ -36,7 +36,7 @@ class Gsettings_desktop_schemas < Package def self.install system "make", "DESTDIR=#{CREW_DEST_DIR}", "install" # the steps required to install the package - # The package is installed using a “DESTDIR” method, /usr/local/share/glib-2.0/schemas/gschemas.compiled was not updated/created. + # The package is installed using a “DESTDIR” method, #{CREW_PREFIX}/share/glib-2.0/schemas/gschemas.compiled was not updated/created. # Generate gschemas.compiled system "glib-compile-schemas #{CREW_DEST_PREFIX}/share/glib-2.0/schemas" end diff --git a/packages/gtypist.rb b/packages/gtypist.rb index 8c61b07fb..09dda604f 100644 --- a/packages/gtypist.rb +++ b/packages/gtypist.rb @@ -26,12 +26,12 @@ class Gtypist < Package def self.build system "autoreconf" - system "./configure", "--prefix=/usr/local" + system "./configure", "--prefix=#{CREW_PREFIX}" system "make" end def self.install - system "make", "prefix=#{CREW_DEST_DIR}/usr/local", "install" - system "rm", "-f", "#{CREW_DEST_DIR}/usr/local/share/info/dir" + system "make", "prefix=#{CREW_DEST_PREFIX}", "install" + system "rm", "-f", "#{CREW_DEST_PREFIX}/share/info/dir" end end diff --git a/packages/gzsize.rb b/packages/gzsize.rb index 085aaa2cb..a224cf6f3 100644 --- a/packages/gzsize.rb +++ b/packages/gzsize.rb @@ -25,9 +25,9 @@ class Gzsize < Package end def self.install - system "mkdir", "-p", "#{CREW_DEST_DIR}/usr/local/bin" - system "mkdir", "-p", "#{CREW_DEST_DIR}/usr/local/man/man1" - FileUtils.cp "gzsize", "#{CREW_DEST_DIR}/usr/local/bin/gzsize" - FileUtils.cp "man/gzsize.1", "#{CREW_DEST_DIR}/usr/local/man/man1/gzsize.1" + system "mkdir", "-p", "#{CREW_DEST_PREFIX}/bin" + system "mkdir", "-p", "#{CREW_DEST_PREFIX}/man/man1" + FileUtils.cp "gzsize", "#{CREW_DEST_PREFIX}/bin/gzsize" + FileUtils.cp "man/gzsize.1", "#{CREW_DEST_PREFIX}/man/man1/gzsize.1" end end diff --git a/packages/hdparm.rb b/packages/hdparm.rb index 58508652d..3e884c753 100644 --- a/packages/hdparm.rb +++ b/packages/hdparm.rb @@ -21,8 +21,8 @@ class Hdparm < Package }) def self.build - system "sed -i 's,binprefix = ,binprefix = /usr/local,' Makefile" - system "sed -i 's,manprefix = /usr,manprefix = /usr/local,' Makefile" + system "sed -i 's,binprefix = ,binprefix = #{CREW_PREFIX},' Makefile" + system "sed -i 's,manprefix = /usr,manprefix = #{CREW_PREFIX},' Makefile" system "make" end diff --git a/packages/healthcheck.rb b/packages/healthcheck.rb index 75d6d1dd8..12dce7599 100644 --- a/packages/healthcheck.rb +++ b/packages/healthcheck.rb @@ -27,8 +27,8 @@ class Healthcheck < Package def self.install system "chmod +x health-check.sh" system "sed -i 's,usr/bin,usr/local/bin,' health-check.sh" - system "mkdir -p #{CREW_DEST_DIR}/usr/local/bin" - system "cp health-check.sh #{CREW_DEST_DIR}/usr/local/bin/healthcheck" + system "mkdir -p #{CREW_DEST_PREFIX}/bin" + system "cp health-check.sh #{CREW_DEST_PREFIX}/bin/healthcheck" puts "" puts "To execute, enter the following:".lightblue puts "sudo healthcheck".lightblue diff --git a/packages/hexedit.rb b/packages/hexedit.rb index 554345bac..8ee35a5be 100644 --- a/packages/hexedit.rb +++ b/packages/hexedit.rb @@ -23,11 +23,11 @@ class Hexedit < Package depends_on 'ncurses' def self.build - system "./configure", "--prefix=/usr/local" - system "make", "CFLAGS=-I/usr/local/include/ncurses" + system "./configure", "--prefix=#{CREW_PREFIX}" + system "make", "CFLAGS=-I#{CREW_PREFIX}/include/ncurses" end def self.install - system "make", "prefix=#{CREW_DEST_DIR}/usr/local", "install" + system "make", "prefix=#{CREW_DEST_PREFIX}", "install" end end diff --git a/packages/iftop.rb b/packages/iftop.rb index b3a3b53ec..79dc56a60 100644 --- a/packages/iftop.rb +++ b/packages/iftop.rb @@ -24,7 +24,7 @@ class Iftop < Package depends_on 'ncurses' def self.build - system './configure --prefix=/usr/local CPPFLAGS="-I/usr/local/include/ncurses"' + system "./configure --prefix=#{CREW_PREFIX} CPPFLAGS='-I#{CREW_PREFIX}/include/ncurses'" system 'make' end diff --git a/packages/inetutils.rb b/packages/inetutils.rb index 78bd4daab..745ad9171 100644 --- a/packages/inetutils.rb +++ b/packages/inetutils.rb @@ -24,7 +24,7 @@ class Inetutils < Package depends_on 'ncurses' def self.build - system "./configure --prefix=/usr/local \ + system "./configure --prefix=#{CREW_PREFIX} \ --localstatedir=/usr/var \ --disable-logger \ --disable-traceroute \ diff --git a/packages/jq.rb b/packages/jq.rb index f83a833bf..7d724b544 100644 --- a/packages/jq.rb +++ b/packages/jq.rb @@ -22,7 +22,7 @@ class Jq < Package def self.build system "./configure", - "--prefix=/usr/local", + "--prefix=#{CREW_PREFIX}", "--disable-maintainer-mode", # disable make rules and dependencies not useful "--disable-docs" # there's no support for manpages system "make" diff --git a/packages/kubectl.rb b/packages/kubectl.rb index ac45aeb23..d6dfef354 100644 --- a/packages/kubectl.rb +++ b/packages/kubectl.rb @@ -31,6 +31,6 @@ class Kubectl < Package end def self.install - system "install", "-D", "-m", "755", "_output/bin/kubectl", "#{CREW_DEST_DIR}/usr/local/bin/kubectl" + system "install", "-D", "-m", "755", "_output/bin/kubectl", "#{CREW_DEST_PREFIX}/bin/kubectl" end end diff --git a/packages/libcap.rb b/packages/libcap.rb index 142cf76f9..0c7b59073 100644 --- a/packages/libcap.rb +++ b/packages/libcap.rb @@ -28,11 +28,11 @@ class Libcap < Package system 'sed -e "/gperf --/s/gperf --/gperf --includes --/" -e "/gperf --/s/cap_lookup_name(/cap_dummy(/" -i libcap/Makefile' # change the path to ld - system 'sed -i "s,/usr/bin/ld,/usr/local/bin/ld,g" Make.Rules' + system "sed -i 's,/usr/bin/ld,#{CREW_PREFIX}/bin/ld,g' Make.Rules" # change prefix - system 'sed -i "s,prefix=/usr,prefix=/usr/local," Make.Rules' + system "sed -i 's,prefix=/usr,prefix=#{CREW_PREFIX},' Make.Rules" # set exec_prefix - system 'sed -i "s,^exec_prefix=,exec_prefix=\$(prefix)," Make.Rules' + system "sed -i 's,^exec_prefix=,exec_prefix=\$(prefix),' Make.Rules" # http://git.yoctoproject.org/cgit.cgi/poky/plain/meta/recipes-support/libcap/files/0001-ensure-the-XATTR_NAME_CAPS-is-defined-when-it-is-use.patch system 'sed -i "s,^\#ifdef VFS_CAP_U32,\#if defined (VFS_CAP_U32) \&\& defined (XATTR_NAME_CAPS),g" libcap/cap_file.c' system 'make' diff --git a/packages/libtirpc.rb b/packages/libtirpc.rb index d1c5e585e..1f298fb8f 100644 --- a/packages/libtirpc.rb +++ b/packages/libtirpc.rb @@ -29,8 +29,8 @@ class Libtirpc < Package def self.install system "make", "DESTDIR=#{CREW_DEST_DIR}", "install" - system "mkdir #{CREW_DEST_DIR}/usr/local/include/rpc" - system "mv #{CREW_DEST_DIR}/usr/local/include/tirpc/rpc/* #{CREW_DEST_DIR}/usr/local/include/rpc/" - system "curl -Lo #{CREW_DEST_DIR}/usr/local/include/netconfig.h https://ftp.netbsd.org/pub/NetBSD/NetBSD-current/src/include/netconfig.h" + system "mkdir #{CREW_DEST_PREFIX}/include/rpc" + system "mv #{CREW_DEST_PREFIX}/include/tirpc/rpc/* #{CREW_DEST_PREFIX}/include/rpc/" + system "curl -Lo #{CREW_DEST_PREFIX}/include/netconfig.h https://ftp.netbsd.org/pub/NetBSD/NetBSD-current/src/include/netconfig.h" end end diff --git a/packages/links.rb b/packages/links.rb index 542ecfe3e..b3d133267 100644 --- a/packages/links.rb +++ b/packages/links.rb @@ -23,7 +23,7 @@ class Links < Package depends_on 'openssl' def self.build - system "./configure --prefix=/usr/local" + system "./configure --prefix=#{CREW_PREFIX}" system "make" end diff --git a/packages/lsb_release.rb b/packages/lsb_release.rb index eb6259d0f..a0c6cdf29 100644 --- a/packages/lsb_release.rb +++ b/packages/lsb_release.rb @@ -19,7 +19,7 @@ class Lsb_release < Package system 'STR=$(grep ^CHROMEOS_RELEASE_NAME= /tmp/lsb-release | cut -d= -f2) && sed -i "s,$STR,\'&\'," /tmp/lsb-release' system 'STR=$(grep ^CHROMEOS_RELEASE_BUILD_TYPE= /tmp/lsb-release | cut -d= -f2) && sed -i "s,$STR$,\'&\'," /tmp/lsb-release' system 'STR=$(grep ^CHROMEOS_RELEASE_DESCRIPTION= /tmp/lsb-release | cut -d= -f2) && sed -i "s,$STR,\'&\'," /tmp/lsb-release' - system "sed -i 's,INFO_ROOT=\"/etc\",INFO_ROOT=\"/usr/local/etc\",' lsb_release" + system "sed -i 's,INFO_ROOT=\"/etc\",INFO_ROOT=\"#{CREW_PREFIX}/etc\",' lsb_release" system "sed -i 's,LSB_VERSION=\$MSG_NA,LSB_VERSION=1.4,' lsb_release" system "sed -i 's,DISTRIB_ID,CHROMEOS_RELEASE_NAME,g' lsb_release" system "sed -i 's,DISTRIB_DESCRIPTION,CHROMEOS_RELEASE_DESCRIPTION,g' lsb_release" diff --git a/packages/lshw.rb b/packages/lshw.rb index a871cce96..8a52268dc 100644 --- a/packages/lshw.rb +++ b/packages/lshw.rb @@ -21,10 +21,10 @@ class Lshw < Package }) def self.build - system "cd lshw-*/src; PREFIX=/usr/local make" + system "cd lshw-*/src; PREFIX=#{CREW_PREFIX} make" end def self.install - system "cd lshw-*/src; PREFIX=/usr/local make DESTDIR=#{CREW_DEST_DIR} install" + system "cd lshw-*/src; PREFIX=#{CREW_PREFIX} make DESTDIR=#{CREW_DEST_DIR} install" end end diff --git a/packages/mapserver.rb b/packages/mapserver.rb index f960c1cbb..22dfaa145 100644 --- a/packages/mapserver.rb +++ b/packages/mapserver.rb @@ -50,7 +50,7 @@ class Mapserver < Package -DWITH_THREAD_SAFETY=1 \ -DWITH_WCS=1 \ -DCMAKE_C_FLAGS=\" -fPIC\" \ - -DCMAKE_INSTALL_PREFIX=/usr/local .. > ../configure.out.txt" + -DCMAKE_INSTALL_PREFIX=#{CREW_PREFIX} .. > ../configure.out.txt" system "make" end end diff --git a/packages/masscan.rb b/packages/masscan.rb index b2ce705f8..4fa4f0b43 100644 --- a/packages/masscan.rb +++ b/packages/masscan.rb @@ -28,7 +28,7 @@ Internet in under 5 minutes.' end def self.install - system "mkdir -p #{CREW_DEST_DIR}/usr/local/bin" - system "cp bin/masscan #{CREW_DEST_DIR}/usr/local/bin" + system "mkdir -p #{CREW_DEST_PREFIX}/bin" + system "cp bin/masscan #{CREW_DEST_PREFIX}/bin" end end diff --git a/packages/mercurial.rb b/packages/mercurial.rb index efde3afa8..113786ef5 100644 --- a/packages/mercurial.rb +++ b/packages/mercurial.rb @@ -31,7 +31,7 @@ class Mercurial < Package puts "Installing docutils dependency..." system "pip", "install", "docutils" end - system "make", "PREFIX=/usr/local", "all" + system "make", "PREFIX=#{CREW_PREFIX}", "all" end def self.install diff --git a/packages/mlocate.rb b/packages/mlocate.rb index 84cf6799f..78e7e9fff 100644 --- a/packages/mlocate.rb +++ b/packages/mlocate.rb @@ -21,8 +21,8 @@ class Mlocate < Package }) def self.build - system "mkdir -p /usr/local/db/mlocate" - system "sed -i 's,\$(localstatedir)/,/usr/local/db/,g' Makefile.*" + system "mkdir -p #{CREW_PREFIX}/db/mlocate" + system "sed -i 's,\$(localstatedir)/,#{CREW_PREFIX}/db/,g' Makefile.*" system "sed -i \"s/groupname = mlocate/groupname = #{USER}/g\" Makefile.*" system "./configure" system "make" diff --git a/packages/moreutils.rb b/packages/moreutils.rb index 215fe61ad..957638016 100644 --- a/packages/moreutils.rb +++ b/packages/moreutils.rb @@ -24,8 +24,8 @@ class Moreutils < Package depends_on 'libxslt' def self.build - system "sed -i 's,PREFIX?=/usr,PREFIX?=/usr/local,' Makefile" - system "sed -i 's,DOCBOOKXSL?=/usr/share/xml/docbook/stylesheet/docbook-xsl,DOCBOOKXSL?=/usr/local/docbook,' Makefile" + system "sed -i 's,PREFIX?=/usr,PREFIX?=#{CREW_PREFIX},' Makefile" + system "sed -i 's,DOCBOOKXSL?=/usr/share/xml/docbook/stylesheet/docbook-xsl,DOCBOOKXSL?=#{CREW_PREFIX}/docbook,' Makefile" system "sed -i 's,share/man,man,g' Makefile" system 'make' end diff --git a/packages/mosh.rb b/packages/mosh.rb index ad5abb12e..f5cff4ea7 100644 --- a/packages/mosh.rb +++ b/packages/mosh.rb @@ -23,7 +23,7 @@ class Mosh < Package depends_on 'protobuf' def self.build - system './configure --prefix=/usr/local' + system "./configure --prefix=#{CREW_PREFIX}" system 'make' end diff --git a/packages/mywanip.rb b/packages/mywanip.rb index 70f059893..4295029a5 100644 --- a/packages/mywanip.rb +++ b/packages/mywanip.rb @@ -22,8 +22,8 @@ class Mywanip < Package def self.install system "chmod +x mywanip" - system "mkdir -p #{CREW_DEST_DIR}/usr/local/bin" - system "cp mywanip #{CREW_DEST_DIR}/usr/local/bin" + system "mkdir -p #{CREW_DEST_PREFIX}/bin" + system "cp mywanip #{CREW_DEST_PREFIX}/bin" end end diff --git a/packages/nanomsg.rb b/packages/nanomsg.rb index 428331d0a..0b17ee202 100644 --- a/packages/nanomsg.rb +++ b/packages/nanomsg.rb @@ -23,7 +23,7 @@ class Nanomsg < Package depends_on 'cmake' def self.build - system "./configure --prefix=/usr/local" + system "./configure --prefix=#{CREW_PREFIX}" system "make" end diff --git a/packages/ncdu.rb b/packages/ncdu.rb index 0c564d8fc..2b161fc26 100644 --- a/packages/ncdu.rb +++ b/packages/ncdu.rb @@ -23,7 +23,7 @@ class Ncdu < Package depends_on 'ncurses' def self.build - system "./configure --prefix=/usr/local CPPFLAGS=-I/usr/local/include/ncurses" + system "./configure --prefix=#{CREW_PREFIX} CPPFLAGS=-I#{CREW_PREFIX}/include/ncurses" system "make" end diff --git a/packages/ncrack.rb b/packages/ncrack.rb index 4e9b6a538..eed411681 100644 --- a/packages/ncrack.rb +++ b/packages/ncrack.rb @@ -23,7 +23,7 @@ class Ncrack < Package depends_on 'buildessential' def self.build - system './configure --prefix=/usr/local' + system "./configure --prefix=#{CREW_PREFIX}" system "make" end diff --git a/packages/netcat.rb b/packages/netcat.rb index b34878d9c..95dfe09ca 100644 --- a/packages/netcat.rb +++ b/packages/netcat.rb @@ -21,7 +21,7 @@ class Netcat < Package }) def self.build - system "./configure --prefix=/usr/local" + system "./configure --prefix=#{CREW_PREFIX}" system "make" end diff --git a/packages/nethack4.rb b/packages/nethack4.rb index 64f0a5d49..3dbab68ec 100644 --- a/packages/nethack4.rb +++ b/packages/nethack4.rb @@ -31,9 +31,9 @@ class Nethack4 < Package target="build" system "mkdir -p " + target Dir.chdir target do - #build with rpath pointing at /usr/local - system "/usr/local/bin/perl ../aimake --config-only -i /usr/local/ --directory-layout=prefix --without=gui" - system "/usr/local/bin/perl ../aimake" + #build with rpath pointing at #{CREW_PREFIX} + system "#{CREW_PREFIX}/bin/perl ../aimake --config-only -i #{CREW_PREFIX}/ --directory-layout=prefix --without=gui" + system "#{CREW_PREFIX}/bin/perl ../aimake" end end @@ -41,7 +41,7 @@ class Nethack4 < Package target="build" Dir.chdir target do #install in destdir so package manager can keep track - system "/usr/local/bin/perl ../aimake --install-only -i #{CREW_DEST_DIR}/usr/local/ --directory-layout=prefix --without=gui" + system "#{CREW_PREFIX}/bin/perl ../aimake --install-only -i #{CREW_DEST_PREFIX}/ --directory-layout=prefix --without=gui" end end end diff --git a/packages/newlisp.rb b/packages/newlisp.rb index ae3b5020f..f1ba3bfa1 100644 --- a/packages/newlisp.rb +++ b/packages/newlisp.rb @@ -32,8 +32,8 @@ class Newlisp < Package # one shipped with bash. # # Ideally I'll figure out how to get it building properly as follows: - # system "./configure --prefix=/usr/local --enable-readline --enable-ffi" - system "./configure-alt --prefix=/usr/local" + # system "./configure --prefix=#{CREW_PREFIX} --enable-readline --enable-ffi" + system "./configure-alt --prefix=#{CREW_PREFIX}" system "make" system "make", "check" end diff --git a/packages/ninja.rb b/packages/ninja.rb index 12234cfa1..a34c1d313 100644 --- a/packages/ninja.rb +++ b/packages/ninja.rb @@ -28,7 +28,7 @@ class Ninja < Package end def self.install - system "mkdir -p #{CREW_DEST_DIR}/usr/local/bin" - system "cp ninja #{CREW_DEST_DIR}/usr/local/bin/" + system "mkdir -p #{CREW_DEST_PREFIX}/bin" + system "cp ninja #{CREW_DEST_PREFIX}/bin/" end end diff --git a/packages/nmap.rb b/packages/nmap.rb index 5ae72802e..3e989ccf8 100644 --- a/packages/nmap.rb +++ b/packages/nmap.rb @@ -24,7 +24,7 @@ class Nmap < Package depends_on 'filecmd' => :build def self.build - #fixup "/usr/bin/file" -> "/usr/local/bin/file" in the configure scripts + #fixup "/usr/bin/file" -> "#{CREW_PREFIX}/bin/file" in the configure scripts system "sed -i s#/usr/bin/file##{CREW_DEST_PREFIX}/bin/file#g libdnet-stripped/configure" system "./configure --with-pcap=linux --without-zenmap --prefix=#{CREW_PREFIX}" system "make" diff --git a/packages/openldap.rb b/packages/openldap.rb index ba4e09e65..0bb8c5d3e 100644 --- a/packages/openldap.rb +++ b/packages/openldap.rb @@ -21,7 +21,7 @@ class Openldap < Package }) def self.build - system "./configure --disable-slapd --prefix=/usr/local" + system "./configure --disable-slapd --prefix=#{CREW_PREFIX}" system "make" system "make depend" end diff --git a/packages/openssl.rb b/packages/openssl.rb index fa3c2eec7..4646a8c26 100644 --- a/packages/openssl.rb +++ b/packages/openssl.rb @@ -56,7 +56,7 @@ class Openssl < Package system "make", "INSTALL_PREFIX=#{CREW_DEST_DIR}", "install" system "find #{CREW_DEST_PREFIX} -name 'lib*.a' -print | xargs rm" - # move man to /usr/local/man + # move man to #{CREW_PREFIX}/man system "mv", "#{CREW_DEST_DIR}/etc/ssl/man", "#{CREW_DEST_PREFIX}/man" # remove all files under /etc/ssl (use system's /etc/ssl as is) diff --git a/packages/optipng.rb b/packages/optipng.rb index 9c5bffe75..27bdfb242 100644 --- a/packages/optipng.rb +++ b/packages/optipng.rb @@ -24,7 +24,7 @@ class Optipng < Package depends_on 'zlibpkg' def self.build - system "./configure --prefix=/usr/local --with-system-libpng" # Bundled libpng doesn't work on armv7l + system "./configure --prefix=#{CREW_PREFIX} --with-system-libpng" # Bundled libpng doesn't work on armv7l system "make" end diff --git a/packages/pagemon.rb b/packages/pagemon.rb index 58819ad46..9310629a2 100644 --- a/packages/pagemon.rb +++ b/packages/pagemon.rb @@ -23,7 +23,7 @@ class Pagemon < Package depends_on 'ncurses' def self.build - system "sed -i 's,/usr,/usr/local,g' Makefile" + system "sed -i 's,/usr,#{CREW_PREFIX},g' Makefile" system "sed -i '/^CFLAGS += -Wall/s/$/ -I\\/usr\\/local\\/include\\/ncurses/' Makefile" system "make" end diff --git a/packages/patchelf.rb b/packages/patchelf.rb index 27bbe4e2c..a5a50ee05 100644 --- a/packages/patchelf.rb +++ b/packages/patchelf.rb @@ -21,7 +21,7 @@ class Patchelf < Package }) def self.build - system "./configure", "prefix=/usr/local" + system "./configure", "prefix=#{CREW_PREFIX}" system "make" end diff --git a/packages/patchutils.rb b/packages/patchutils.rb index adc839fa5..1432d8f03 100644 --- a/packages/patchutils.rb +++ b/packages/patchutils.rb @@ -21,8 +21,8 @@ class Patchutils < Package }) def self.build - system './configure --prefix=/usr/local' - system "make" + system "./configure --prefix=#{CREW_PREFIX}" + system 'make' end def self.install diff --git a/packages/perl.rb b/packages/perl.rb index 6335830f4..a1d5f8ef5 100644 --- a/packages/perl.rb +++ b/packages/perl.rb @@ -25,7 +25,7 @@ class Perl < Package def self.build # Use system zlib and bzip2 # Create shared library - # Install manual files into /usr/local/share/man/man* even if groff is not installed. + # Install manual files into #{CREW_PREFIX}/share/man/man* even if groff is not installed. system "BUILD_ZLIB=False BUILD_BZIP2=0 ./Configure -de -Duseshrplib -Dman1dir=#{CREW_PREFIX}/share/man/man1 -Dman3dir=#{CREW_PREFIX}/share/man/man3" system "make" system "curl -o cpanm https://cpanmin.us" diff --git a/packages/powerline_fonts.rb b/packages/powerline_fonts.rb index 45ade8f5d..290dc9931 100644 --- a/packages/powerline_fonts.rb +++ b/packages/powerline_fonts.rb @@ -21,21 +21,20 @@ class Powerline_fonts < Package }) def self.install - fonts = "#{CREW_DEST_DIR}/usr/local/share/fonts" + fonts = "#{CREW_DEST_PREFIX}/share/fonts" FileUtils.mkdir_p(fonts) Dir.glob('*').each do |f| FileUtils.mv(f, fonts) unless ["README.rst", "install.sh"].include? f end - home = "#{CREW_DEST_DIR}/home/chronos/user" - FileUtils.mkdir_p(home) - FileUtils.cd(home) do + FileUtils.mkdir_p("#{CREW_DEST_HOME}") + FileUtils.cd("#{CREW_DEST_HOME}") do File.open('.font.conf','w') do |f| f.puts "" f.puts "" f.puts "" - f.puts "\t/usr/local/share/fonts" + f.puts "\t#{CREW_PREFIX}/share/fonts" f.puts "" end diff --git a/packages/pwgen.rb b/packages/pwgen.rb index 9c9a13889..3c90ba906 100644 --- a/packages/pwgen.rb +++ b/packages/pwgen.rb @@ -21,7 +21,7 @@ class Pwgen < Package }) def self.build - system "./configure --prefix=/usr/local" + system "./configure --prefix=#{CREW_PREFIX}" system "make" end diff --git a/packages/python27.rb b/packages/python27.rb index b7c646ecb..3b5118a4f 100644 --- a/packages/python27.rb +++ b/packages/python27.rb @@ -25,7 +25,7 @@ class Python27 < Package def self.build # IMPORTANT: Do not build with python27 already installed or pip will not be included. - # python requires /usr/local/lib, so leave as is but specify -rpath + # python requires #{CREW_LIB_PREFIX}, so leave as is but specify -rpath system "./configure", "CPPFLAGS=-I#{CREW_PREFIX}/include/ncurses -I#{CREW_PREFIX}/include/ncursesw", "LDFLAGS=-Wl,-rpath,-L#{CREW_LIB_PREFIX}", "--with-ensurepip=install", "--enable-shared" diff --git a/packages/qemacs.rb b/packages/qemacs.rb index 762403405..785837d35 100644 --- a/packages/qemacs.rb +++ b/packages/qemacs.rb @@ -24,7 +24,7 @@ class Qemacs < Package system "sed -i 's,css.h,libqhtml/css.h,' html2png.c" system "sed -i 's/$(prefix)/$(DESTDIR)$(prefix)/g' Makefile" system "./configure", \ - "--prefix=/usr/local", \ + "--prefix=#{CREW_PREFIX}", \ "--disable-x11", \ "--disable-xv", \ "--disable-xrender", \ @@ -34,9 +34,9 @@ class Qemacs < Package end def self.install - system "mkdir", "-p", "#{CREW_DEST_DIR}/usr/local/bin" - system "mkdir", "-p", "#{CREW_DEST_DIR}/usr/local/share/qe" - system "mkdir", "-p", "#{CREW_DEST_DIR}/usr/local/man/man1" + system "mkdir", "-p", "#{CREW_DEST_PREFIX}/bin" + system "mkdir", "-p", "#{CREW_DEST_PREFIX}/share/qe" + system "mkdir", "-p", "#{CREW_DEST_PREFIX}/man/man1" system "make", "DESTDIR=#{CREW_DEST_DIR}", "install" end end diff --git a/packages/qt.rb b/packages/qt.rb index 6da10d6d2..4c45deac6 100644 --- a/packages/qt.rb +++ b/packages/qt.rb @@ -28,7 +28,7 @@ class Qt < Package system "echo ' gui.clickButton(buttons.NextButton);' >> qt-installer-script.qs" system "echo '}' >> qt-installer-script.qs" system "echo 'Controller.prototype.TargetDirectoryPageCallback = function() {' >> qt-installer-script.qs" - system "echo ' gui.currentPageWidget().TargetDirectoryLineEdit.setText(\"/usr/local/share/qt\");' >> qt-installer-script.qs" + system "echo ' gui.currentPageWidget().TargetDirectoryLineEdit.setText(\"#{CREW_PREFIX}/share/qt\");' >> qt-installer-script.qs" system "echo ' gui.clickButton(buttons.NextButton);' >> qt-installer-script.qs" system "echo '}' >> qt-installer-script.qs" system "echo 'Controller.prototype.ComponentSelectionPageCallback = function() {' >> qt-installer-script.qs" diff --git a/packages/quakespasm.rb b/packages/quakespasm.rb index 419969ad3..d9d200adc 100644 --- a/packages/quakespasm.rb +++ b/packages/quakespasm.rb @@ -41,7 +41,7 @@ class Quakespasm < Package end def self.postinstall - puts "Please make sure you have the proper .pak and/or .wad files to play Quake!".lightblue - puts "By default, quakespasm uses the current directory, but you can also specify the -basedir option.".lightblue + puts "Please make sure you have the proper .pak and/or .wad files to play Quake!".lightblue + puts "By default, quakespasm uses the current directory, but you can also specify the -basedir option.".lightblue end end diff --git a/packages/rfkill.rb b/packages/rfkill.rb index 95abd7148..052add1c1 100644 --- a/packages/rfkill.rb +++ b/packages/rfkill.rb @@ -27,7 +27,7 @@ class Rfkill < Package end def self.install - system "make", "DESTDIR=#{CREW_DEST_DIR}", "SBINDIR=/usr/local/sbin", "MANDIR=/usr/local/share/man", "install" + system "make", "DESTDIR=#{CREW_DEST_DIR}", "SBINDIR=#{CREW_PREFIX}/sbin", "MANDIR=#{CREW_PREFIX}/share/man", "install" end def self.check diff --git a/packages/ruby.rb b/packages/ruby.rb index e0e3966ef..c7c235549 100644 --- a/packages/ruby.rb +++ b/packages/ruby.rb @@ -36,6 +36,6 @@ class Ruby < Package end def self.check - system "TMPDIR=/usr/local/tmp make check" + system "TMPDIR=#{CREW_PREFIX}/tmp make check" end end diff --git a/packages/s.rb b/packages/s.rb index be53d2cad..e0eb5d99e 100644 --- a/packages/s.rb +++ b/packages/s.rb @@ -37,13 +37,13 @@ class S < Package depends_on 'unzip' def self.install - system "mkdir -p #{CREW_DEST_DIR}/usr/local/bin" + system "mkdir -p #{CREW_DEST_PREFIX}/bin" system "mkdir -p #{CREW_DEST_DIR}/home/#{USER}/user" system "cp autocomplete/s-completion.bash /home/#{USER}/user/.s-completion.bash" system "cp autocomplete/s-completion.bash #{CREW_DEST_DIR}/home/#{USER}/user/.s-completion.bash" system "cp autocomplete/s.fish /home/#{USER}/user/.s.fish" system "cp autocomplete/s.fish #{CREW_DEST_DIR}/home/#{USER}/user/.s.fish" - system "cp s #{CREW_DEST_DIR}/usr/local/bin" + system "cp s #{CREW_DEST_PREFIX}/bin" puts "" puts "In order to enable autocomplete for bash, execute the following:".lightblue puts "echo \"source ~/.s-completion.bash\" >> ~/.bashrc && source ~/.bashrc".lightblue diff --git a/packages/sbt.rb b/packages/sbt.rb index ee1299bb8..adc0942c4 100644 --- a/packages/sbt.rb +++ b/packages/sbt.rb @@ -23,18 +23,18 @@ class Sbt < Package depends_on 'jdk8' def self.install - system "mkdir", "-p", "#{CREW_DEST_DIR}/usr/local/share/sbt/bin" - system "install", "-m", "644", "bin/sbt-launch.jar", "#{CREW_DEST_DIR}/usr/local/share/sbt/bin" - system "install", "-m", "644", "bin/sbt-launch-lib.bash", "#{CREW_DEST_DIR}/usr/local/share/sbt/bin" - system "install", "-m", "755", "bin/sbt", "#{CREW_DEST_DIR}/usr/local/share/sbt/bin" + system "mkdir", "-p", "#{CREW_DEST_PREFIX}/share/sbt/bin" + system "install", "-m", "644", "bin/sbt-launch.jar", "#{CREW_DEST_PREFIX}/share/sbt/bin" + system "install", "-m", "644", "bin/sbt-launch-lib.bash", "#{CREW_DEST_PREFIX}/share/sbt/bin" + system "install", "-m", "755", "bin/sbt", "#{CREW_DEST_PREFIX}/share/sbt/bin" - system "mkdir", "-p", "#{CREW_DEST_DIR}/usr/local/share/sbt/conf" - system "install", "-m", "644", "conf/sbtopts", "#{CREW_DEST_DIR}/usr/local/share/sbt/conf" + system "mkdir", "-p", "#{CREW_DEST_PREFIX}/share/sbt/conf" + system "install", "-m", "644", "conf/sbtopts", "#{CREW_DEST_PREFIX}/share/sbt/conf" - system "mkdir", "-p", "#{CREW_DEST_DIR}/usr/local/bin" - system "ln", "-s", "/usr/local/share/sbt/bin/sbt", "#{CREW_DEST_DIR}/usr/local/bin/sbt" + system "mkdir", "-p", "#{CREW_DEST_PREFIX}/bin" + system "ln", "-s", "#{CREW_PREFIX}/share/sbt/bin/sbt", "#{CREW_DEST_PREFIX}/bin/sbt" - system "mkdir", "-p", "#{CREW_DEST_DIR}/usr/local/etc/sbt" - system "ln", "-s", "/usr/local/share/sbt/conf/sbtopts", "#{CREW_DEST_DIR}/usr/local/etc/sbt/sbtopts" + system "mkdir", "-p", "#{CREW_DEST_PREFIX}/etc/sbt" + system "ln", "-s", "#{CREW_PREFIX}/share/sbt/conf/sbtopts", "#{CREW_DEST_PREFIX}/etc/sbt/sbtopts" end end diff --git a/packages/shtool.rb b/packages/shtool.rb index 2312fb875..9b6f60559 100644 --- a/packages/shtool.rb +++ b/packages/shtool.rb @@ -26,9 +26,9 @@ class Shtool < Package end def self.install - system "mkdir -p #{CREW_DEST_DIR}/usr/local/bin" - system "mkdir -p #{CREW_DEST_DIR}/usr/local/man/man1" - system "cp shtool #{CREW_DEST_DIR}/usr/local/bin" - system "cp *.1 #{CREW_DEST_DIR}/usr/local/man/man1" + system "mkdir -p #{CREW_DEST_PREFIX}/bin" + system "mkdir -p #{CREW_DEST_PREFIX}/man/man1" + system "cp shtool #{CREW_DEST_PREFIX}/bin" + system "cp *.1 #{CREW_DEST_PREFIX}/man/man1" end end diff --git a/packages/sluice.rb b/packages/sluice.rb index c27e5410e..8cb7f0d1f 100644 --- a/packages/sluice.rb +++ b/packages/sluice.rb @@ -21,7 +21,7 @@ class Sluice < Package }) def self.build - system "sed -i 's,/usr,/usr/local,g' Makefile" + system "sed -i 's,/usr,#{CREW_PREFIX},g' Makefile" system "make" end diff --git a/packages/smemstat.rb b/packages/smemstat.rb index 15ba4ef61..a5d06db0c 100644 --- a/packages/smemstat.rb +++ b/packages/smemstat.rb @@ -23,7 +23,7 @@ class Smemstat < Package depends_on 'ncurses' def self.build - system "sed -i 's,/usr,/usr/local,g' Makefile" + system "sed -i 's,/usr,#{CREW_PREFIX},g' Makefile" system "sed -i '/^CFLAGS += -Wall/s/$/ -I\\/usr\\/local\\/include\\/ncurses/' Makefile" system "make" end diff --git a/packages/sshfs.rb b/packages/sshfs.rb index 7dc10366e..e4b018127 100644 --- a/packages/sshfs.rb +++ b/packages/sshfs.rb @@ -24,7 +24,7 @@ class Sshfs < Package depends_on 'fuse' def self.build - system "./configure --prefix=/usr/local" + system "./configure --prefix=#{CREW_PREFIX}" system "make" end diff --git a/packages/syncthing.rb b/packages/syncthing.rb index 66d1cba50..37682602f 100644 --- a/packages/syncthing.rb +++ b/packages/syncthing.rb @@ -24,7 +24,7 @@ class Syncthing < Package def self.build #The system tmp dir is mounted noexec, and the build will fail if it is used - system "TMPDIR=/usr/local/tmp go run build.go -version v0.14.40" + system "TMPDIR=#{CREW_PREFIX}/tmp go run build.go -version v0.14.40" end def self.install @@ -59,6 +59,6 @@ sudo /sbin/iptables -D INPUT -p udp --dport 21025 -j ACCEPT system "chmod +x #{CREW_DEST_PREFIX}/bin/syncthing" #The build process leaves 50M of files around that we do not need - system "rm -rf /usr/local/tmp/syncthing-*/" + system "rm -rf #{CREW_PREFIX}/tmp/syncthing-*/" end end diff --git a/packages/sysstat.rb b/packages/sysstat.rb index 60342399c..1ac5e6cc5 100644 --- a/packages/sysstat.rb +++ b/packages/sysstat.rb @@ -26,9 +26,9 @@ class Sysstat < Package system "sed -i 's/root/$(whoami)/g' configure.in" system "sed -i 's/root/$(whoami)/g' sysstat-11.5.6.spec" system "./configure \ - --docdir=/usr/local/doc \ - --infodir=/usr/local/info \ - --mandir=/usr/local/man" + --docdir=#{CREW_PREFIX}/doc \ + --infodir=#{CREW_PREFIX}/info \ + --mandir=#{CREW_PREFIX}/man" system "make" end diff --git a/packages/tcpdump.rb b/packages/tcpdump.rb index a9d13d7af..9ba856cab 100644 --- a/packages/tcpdump.rb +++ b/packages/tcpdump.rb @@ -24,7 +24,7 @@ class Tcpdump < Package depends_on 'openssl' def self.build - system "./configure --prefix=/usr/local --with-user=chronos" + system "./configure --prefix=#{CREW_PREFIX} --with-user=#{USER}" system "make" end diff --git a/packages/tcpstat.rb b/packages/tcpstat.rb index dc5452650..d05fd9d7c 100644 --- a/packages/tcpstat.rb +++ b/packages/tcpstat.rb @@ -21,7 +21,7 @@ class Tcpstat < Package }) def self.build - system "./configure", "--prefix=/usr/local" + system "./configure", "--prefix=#{CREW_PREFIX}" system "make" end diff --git a/packages/terraform.rb b/packages/terraform.rb index 039378774..8aafe11ec 100644 --- a/packages/terraform.rb +++ b/packages/terraform.rb @@ -27,7 +27,7 @@ class Terraform < Package system 'cp -aT . ../src/github.com/hashicorp/terraform/' system 'mv ../src .' system 'export GOPATH=`pwd`; go get -u golang.org/x/tools/cmd/stringer' - system 'export TMPDIR=/usr/local/tmp; export GOPATH=`pwd`; export PATH=$PATH:$GOPATH/bin; cd src/github.com/hashicorp/terraform/; make dev' + system "export TMPDIR=#{CREW_PREFIX}/tmp; export GOPATH=`pwd`; export PATH=\$PATH:\$GOPATH/bin; cd src/github.com/hashicorp/terraform/; make dev" end def self.install diff --git a/packages/tinycc.rb b/packages/tinycc.rb index 48baeacbf..1368a2f80 100644 --- a/packages/tinycc.rb +++ b/packages/tinycc.rb @@ -21,7 +21,7 @@ class Tinycc < Package }) def self.build - system "./configure --prefix=/usr/local" + system "./configure --prefix=#{CREW_PREFIX}" system "make" end diff --git a/packages/tree.rb b/packages/tree.rb index 07810c500..f9d734821 100644 --- a/packages/tree.rb +++ b/packages/tree.rb @@ -21,7 +21,7 @@ class Tree < Package }) def self.build - system "sed -i 's,/usr,/usr/local,g' Makefile" + system "sed -i 's,/usr,#{CREW_PREFIX},g' Makefile" system "sed -i '25s,=,=$(DESTDIR),' Makefile" system "sed -i '27s,=,=$(DESTDIR),' Makefile" system "make" diff --git a/packages/unshield.rb b/packages/unshield.rb index ecc8cbbc1..902f3b17e 100644 --- a/packages/unshield.rb +++ b/packages/unshield.rb @@ -28,8 +28,8 @@ class Unshield < Package end def self.install - system "mkdir -p #{CREW_DEST_DIR}/usr/local/man/man1" - system "cp man/* #{CREW_DEST_DIR}/usr/local/man/man1" + system "mkdir -p #{CREW_DEST_PREFIX}/man/man1" + system "cp man/* #{CREW_DEST_PREFIX}/man/man1" system "make", "DESTDIR=#{CREW_DEST_DIR}", "install" end end diff --git a/packages/waf.rb b/packages/waf.rb index d5574bb22..187a06155 100644 --- a/packages/waf.rb +++ b/packages/waf.rb @@ -21,7 +21,7 @@ class Waf < Package }) depends_on 'help2man' - depends_on 'python27' unless File.exists? '/usr/local/bin/python' + depends_on 'python27' unless File.exists? "#{CREW_PREFIX}/bin/python" def self.build system './waf-light configure build' diff --git a/packages/wbox.rb b/packages/wbox.rb index 66bb8dd41..e23da1d90 100644 --- a/packages/wbox.rb +++ b/packages/wbox.rb @@ -25,7 +25,7 @@ class Wbox < Package end def self.install - FileUtils.mkdir_p "#{CREW_DEST_DIR}/usr/local/bin" - FileUtils.cp "wbox", "#{CREW_DEST_DIR}/usr/local/bin/" + FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/bin" + FileUtils.cp "wbox", "#{CREW_DEST_PREFIX}/bin/" end end diff --git a/packages/whois.rb b/packages/whois.rb index 966f7e536..d4c8f52fe 100644 --- a/packages/whois.rb +++ b/packages/whois.rb @@ -23,8 +23,8 @@ class Whois < Package depends_on 'gettext' def self.build - system "sed -i 's,prefix = /usr,prefix = /usr/local,' Makefile" - system "sed -i 's,prefix = /usr,prefix = /usr/local,' po/Makefile" + system "sed -i 's,prefix = /usr,prefix = #{CREW_PREFIX},' Makefile" + system "sed -i 's,prefix = /usr,prefix = #{CREW_PREFIX},' po/Makefile" system "sed -i 's,/share/,/,g' Makefile" system "sed -i 's,/share/,/,g' po/Makefile" system "sed -i 's,/share/,/,g' config.h" diff --git a/packages/wine.rb b/packages/wine.rb index d226d8da8..5ecca3065 100644 --- a/packages/wine.rb +++ b/packages/wine.rb @@ -33,8 +33,8 @@ class Wine < Package def self.install case ARCH when "x86_64" - system "mkdir -p #{CREW_DEST_DIR}/usr/local/bin" - FileUtils.cd("#{CREW_DEST_DIR}/usr/local/bin") do + FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/bin" + FileUtils.cd("#{CREW_DEST_PREFIX}/bin") do system "ln -s wine64 wine" end end diff --git a/packages/xzutils.rb b/packages/xzutils.rb index 858723a76..ffa4d878d 100644 --- a/packages/xzutils.rb +++ b/packages/xzutils.rb @@ -21,7 +21,7 @@ class Xzutils < Package }) def self.build - system "./configure", "--prefix=/usr/local", "--libdir=#{CREW_LIB_PREFIX}", + system "./configure", "--prefix=#{CREW_PREFIX}", "--libdir=#{CREW_LIB_PREFIX}", "--disable-docs", "--enable-shared", "--disable-static", "--with-pic" system "make" end diff --git a/packages/yasm.rb b/packages/yasm.rb index ebd317217..edf33bb44 100644 --- a/packages/yasm.rb +++ b/packages/yasm.rb @@ -21,7 +21,7 @@ class Yasm < Package }) def self.build - system './configure --prefix=/usr/local' + system "./configure --prefix=#{CREW_PREFIX}" system 'make' end diff --git a/packages/zsh.rb b/packages/zsh.rb index b18eea2ab..6f1249a3f 100644 --- a/packages/zsh.rb +++ b/packages/zsh.rb @@ -23,7 +23,7 @@ class Zsh < Package depends_on 'ncurses' def self.build - system "./configure --prefix=/usr/local" + system "./configure --prefix=#{CREW_PREFIX}" system "make" end