From cea13eff9f6a25d70e283dfca1255efdecb944cf Mon Sep 17 00:00:00 2001 From: Ed Reel Date: Sat, 29 Jan 2022 15:31:15 -0600 Subject: [PATCH] Add reload_constants command (#6686) --- bin/crew | 25 +++++++++++++++++++++---- lib/const.rb | 2 +- lib/package_helpers.rb | 7 +++++++ packages/codium.rb | 5 +---- packages/firefox.rb | 5 +---- packages/freetype_sub.rb | 5 +---- packages/gawk.rb | 5 +---- packages/gcloud.rb | 5 +---- packages/libsigsegv.rb | 5 +---- packages/linux_sources.rb | 5 +---- packages/linuxheaders.rb | 5 +---- packages/lsb_release.rb | 5 +---- packages/minecraft.rb | 5 +---- packages/musl_linuxheaders.rb | 5 +---- packages/mysql.rb | 5 +---- packages/packer.rb | 5 +---- packages/php71.rb | 5 +---- packages/php72.rb | 5 +---- packages/php73.rb | 5 +---- packages/php74.rb | 5 +---- packages/php80.rb | 5 +---- packages/php81.rb | 5 +---- packages/qtlocation.rb | 5 +---- packages/qtmultimedia.rb | 5 +---- packages/qtscript.rb | 5 +---- packages/qtserialport.rb | 5 +---- packages/qtwayland.rb | 5 +---- packages/teams.rb | 5 +---- packages/webkit2gtk_5.rb | 5 +---- 29 files changed, 55 insertions(+), 109 deletions(-) diff --git a/bin/crew b/bin/crew index 29482687c..ca71faa6a 100755 --- a/bin/crew +++ b/bin/crew @@ -69,7 +69,24 @@ CREW_LICENSE = <<~LICENSESTRING LICENSESTRING # All available crew commands. -@cmds = ["autoremove", "build", "const", "deps", "download", "files", "help", "install", "list", "postinstall", "reinstall", "remove", "search", "update", "upgrade", "whatprovides"] +@cmds = [ + 'autoremove', + 'build', + 'const', + 'deps', + 'download', + 'files', + 'help', + 'install', + 'list', + 'postinstall', + 'reinstall', + 'remove', + 'search', + 'update', + 'upgrade', + 'whatprovides' +] # Parse arguments using docopt require_relative '../lib/docopt' @@ -538,7 +555,7 @@ def update if @pkg.nil? puts "Package file for #{package[:name]} not found. :(".lightred if @opt_verbose next - end + end if package[:version].to_s != @pkg.version canBeUpdated += 1 puts @pkg.name + ' could be updated from ' + package[:version].to_s + ' to ' + @pkg.version @@ -1506,7 +1523,7 @@ def autoremove_command(args) end.map {|pkg| pkg[:name] } return if remove_pkg.empty? - + puts 'The following packages also need to be REMOVED: ' remove_pkg.each do |pkg| print pkg + ' ' @@ -1523,7 +1540,7 @@ def autoremove_command(args) puts "I don't understand `#{response}`. :(".lightred abort 'No changes made.' end - + remove_pkg.each {|pkg| remove(pkg) } end diff --git a/lib/const.rb b/lib/const.rb index f6e13a8c8..836480670 100644 --- a/lib/const.rb +++ b/lib/const.rb @@ -1,6 +1,6 @@ # Defines common constants used in different parts of crew -CREW_VERSION = '1.22.0' +CREW_VERSION = '1.22.1' ARCH_ACTUAL = `uname -m`.chomp # This helps with virtualized builds on aarch64 machines diff --git a/lib/package_helpers.rb b/lib/package_helpers.rb index fdddb37fc..6ca084864 100644 --- a/lib/package_helpers.rb +++ b/lib/package_helpers.rb @@ -21,3 +21,10 @@ def property (*properties) EOT end end + +def reload_constants + warn_level = $VERBOSE + $VERBOSE = nil + load "#{CREW_LIB_PATH}lib/const.rb" + $VERBOSE = warn_level +end diff --git a/packages/codium.rb b/packages/codium.rb index 6198e00bc..5bdb73e3d 100644 --- a/packages/codium.rb +++ b/packages/codium.rb @@ -47,10 +47,7 @@ class Codium < Package def self.install ENV['CREW_NOT_SHRINK_ARCHIVE'] = '1' ENV['CREW_FHS_NONCOMPLIANCE_ONLY_ADVISORY'] = '1' - warn_level = $VERBOSE - $VERBOSE = nil - load "#{CREW_LIB_PATH}lib/const.rb" - $VERBOSE = warn_level + reload_constants FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/VSCodium-linux-#{@arch}" FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/bin" FileUtils.cp_r '.', "#{CREW_DEST_PREFIX}/VSCodium-linux-#{@arch}" diff --git a/packages/firefox.rb b/packages/firefox.rb index 2931d9b62..ac6bc0360 100644 --- a/packages/firefox.rb +++ b/packages/firefox.rb @@ -64,10 +64,7 @@ class Firefox < Package def self.install ENV['CREW_FHS_NONCOMPLIANCE_ONLY_ADVISORY'] = '1' - warn_level = $VERBOSE - $VERBOSE = nil - load "#{CREW_LIB_PATH}lib/const.rb" - $VERBOSE = warn_level + reload_constants FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/bin" FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/firefox" FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/share/applications" diff --git a/packages/freetype_sub.rb b/packages/freetype_sub.rb index 408c10461..c7abe19d9 100644 --- a/packages/freetype_sub.rb +++ b/packages/freetype_sub.rb @@ -36,10 +36,7 @@ class Freetype_sub < Package def self.install ENV['CREW_CONFLICTS_ONLY_ADVISORY'] = '1' - warn_level = $VERBOSE - $VERBOSE = nil - load "#{CREW_LIB_PATH}lib/const.rb" - $VERBOSE = warn_level + reload_constants system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install' end diff --git a/packages/gawk.rb b/packages/gawk.rb index a1a369bc9..d83c1575a 100644 --- a/packages/gawk.rb +++ b/packages/gawk.rb @@ -51,10 +51,7 @@ class Gawk < Package def self.install # Conflict with /usr/local/bin/awk from mawk package. ENV['CREW_CONFLICTS_ONLY_ADVISORY'] = '1' - warn_level = $VERBOSE - $VERBOSE = nil - load "#{CREW_LIB_PATH}lib/const.rb" - $VERBOSE = warn_level + reload_constants system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install' end end diff --git a/packages/gcloud.rb b/packages/gcloud.rb index 7225781e9..d548b8b2d 100644 --- a/packages/gcloud.rb +++ b/packages/gcloud.rb @@ -30,10 +30,7 @@ class Gcloud < Package def self.install ENV['CREW_NOT_SHRINK_ARCHIVE'] = '1' - warn_level = $VERBOSE - $VERBOSE = nil - load "#{CREW_LIB_PATH}lib/const.rb" - $VERBOSE = warn_level + reload_constants FileUtils.mkdir_p "#{CREW_DEST_HOME}/.config/gcloud" FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/share/gcloud" FileUtils.cp_r Dir['.'], "#{CREW_DEST_PREFIX}/share/gcloud" diff --git a/packages/libsigsegv.rb b/packages/libsigsegv.rb index 67c3412d0..4b121f08e 100644 --- a/packages/libsigsegv.rb +++ b/packages/libsigsegv.rb @@ -26,10 +26,7 @@ class Libsigsegv < Package system 'autoreconf -fiv' # libsigsegv fails to build with LTO. ENV['CREW_DISABLE_ENV_OPTIONS'] = '1' - warn_level = $VERBOSE - $VERBOSE = nil - load "#{CREW_LIB_PATH}lib/const.rb" - $VERBOSE = warn_level + reload_constants system "#{CREW_ENV_FNO_LTO_OPTIONS} ./configure #{CREW_OPTIONS} \ --enable-shared \ --enable-static \ diff --git a/packages/linux_sources.rb b/packages/linux_sources.rb index a07086a72..15d0c311e 100644 --- a/packages/linux_sources.rb +++ b/packages/linux_sources.rb @@ -37,10 +37,7 @@ class Linux_sources < Package def self.install ENV['CREW_FHS_NONCOMPLIANCE_ONLY_ADVISORY'] = '1' - warn_level = $VERBOSE - $VERBOSE = nil - load "#{CREW_LIB_PATH}lib/const.rb" - $VERBOSE = warn_level + reload_constants linux_src_dir = "#{CREW_DEST_PREFIX}/src/linux" FileUtils.mkdir_p(linux_src_dir) FileUtils.rm_rf('.git') diff --git a/packages/linuxheaders.rb b/packages/linuxheaders.rb index bf4330169..b873d51d7 100644 --- a/packages/linuxheaders.rb +++ b/packages/linuxheaders.rb @@ -39,10 +39,7 @@ class Linuxheaders < Package def self.install ENV['CREW_FHS_NONCOMPLIANCE_ONLY_ADVISORY'] = '1' - warn_level = $VERBOSE - $VERBOSE = nil - load "#{CREW_LIB_PATH}lib/const.rb" - $VERBOSE = warn_level + reload_constants linux_src_dir = "#{CREW_PREFIX}/src/linux" Dir.chdir(linux_src_dir) do system 'make', diff --git a/packages/lsb_release.rb b/packages/lsb_release.rb index 21c8f18fa..7995953dd 100644 --- a/packages/lsb_release.rb +++ b/packages/lsb_release.rb @@ -37,10 +37,7 @@ class Lsb_release < Package def self.install ENV['CREW_FHS_NONCOMPLIANCE_ONLY_ADVISORY'] = '1' - warn_level = $VERBOSE - $VERBOSE = nil - load "#{CREW_LIB_PATH}lib/const.rb" - $VERBOSE = warn_level + reload_constants FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/bin" FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/etc" FileUtils.mkdir_p "#{CREW_DEST_MAN_PREFIX}/man1" diff --git a/packages/minecraft.rb b/packages/minecraft.rb index 80259704c..932d3182c 100644 --- a/packages/minecraft.rb +++ b/packages/minecraft.rb @@ -20,10 +20,7 @@ class Minecraft < Package def self.install ENV['CREW_FHS_NONCOMPLIANCE_ONLY_ADVISORY'] = '1' - warn_level = $VERBOSE - $VERBOSE = nil - load "#{CREW_LIB_PATH}lib/const.rb" - $VERBOSE = warn_level + reload_constants FileUtils.mkdir_p "#{CREW_DEST_PREFIX}" FileUtils.cp_r '.', "#{CREW_DEST_PREFIX}/" FileUtils.mv "#{CREW_DEST_PREFIX}/bin/minecraft-launcher", "#{CREW_DEST_PREFIX}/bin/minecraft-launcher.elf" diff --git a/packages/musl_linuxheaders.rb b/packages/musl_linuxheaders.rb index c58897433..b3a096576 100644 --- a/packages/musl_linuxheaders.rb +++ b/packages/musl_linuxheaders.rb @@ -38,10 +38,7 @@ class Musl_linuxheaders < Package def self.install ENV['CREW_FHS_NONCOMPLIANCE_ONLY_ADVISORY'] = '1' - warn_level = $VERBOSE - $VERBOSE = nil - load "#{CREW_LIB_PATH}lib/const.rb" - $VERBOSE = warn_level + reload_constants linux_src_dir = "#{CREW_PREFIX}/src/linux" Dir.chdir(linux_src_dir) do system 'make', diff --git a/packages/mysql.rb b/packages/mysql.rb index 261b341e8..b879e90bb 100644 --- a/packages/mysql.rb +++ b/packages/mysql.rb @@ -18,10 +18,7 @@ class Mysql < Package def self.install ENV['CREW_FHS_NONCOMPLIANCE_ONLY_ADVISORY'] = '1' - warn_level = $VERBOSE - $VERBOSE = nil - load "#{CREW_LIB_PATH}lib/const.rb" - $VERBOSE = warn_level + reload_constants FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/bin" FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/mysql" FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/share" diff --git a/packages/packer.rb b/packages/packer.rb index 9a7fb2d05..22ef08416 100644 --- a/packages/packer.rb +++ b/packages/packer.rb @@ -21,10 +21,7 @@ class Packer < Package def self.install ENV['CREW_NOT_STRIP'] = '1' - warn_level = $VERBOSE - $VERBOSE = nil - load "#{CREW_LIB_PATH}lib/const.rb" - $VERBOSE = warn_level + reload_constants FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/bin" FileUtils.install 'packer', "#{CREW_DEST_PREFIX}/bin/packer", mode: 0o755 end diff --git a/packages/php71.rb b/packages/php71.rb index f14083642..4f05a005a 100644 --- a/packages/php71.rb +++ b/packages/php71.rb @@ -116,10 +116,7 @@ class Php71 < Package def self.install ENV['CREW_FHS_NONCOMPLIANCE_ONLY_ADVISORY'] = '1' - warn_level = $VERBOSE - $VERBOSE = nil - load "#{CREW_LIB_PATH}lib/const.rb" - $VERBOSE = warn_level + reload_constants FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/log" FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/tmp/run" FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/etc/init.d" diff --git a/packages/php72.rb b/packages/php72.rb index b4f739385..ea067d703 100644 --- a/packages/php72.rb +++ b/packages/php72.rb @@ -112,10 +112,7 @@ class Php72 < Package def self.install ENV['CREW_FHS_NONCOMPLIANCE_ONLY_ADVISORY'] = '1' - warn_level = $VERBOSE - $VERBOSE = nil - load "#{CREW_LIB_PATH}lib/const.rb" - $VERBOSE = warn_level + reload_constants FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/log" FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/tmp/run" FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/etc/init.d" diff --git a/packages/php73.rb b/packages/php73.rb index 766d047c1..9b4d37465 100644 --- a/packages/php73.rb +++ b/packages/php73.rb @@ -116,10 +116,7 @@ class Php73 < Package def self.install ENV['CREW_FHS_NONCOMPLIANCE_ONLY_ADVISORY'] = '1' - warn_level = $VERBOSE - $VERBOSE = nil - load "#{CREW_LIB_PATH}lib/const.rb" - $VERBOSE = warn_level + reload_constants FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/log" FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/tmp/run" FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/etc/init.d" diff --git a/packages/php74.rb b/packages/php74.rb index bcdf5ef17..51af96c5e 100644 --- a/packages/php74.rb +++ b/packages/php74.rb @@ -133,10 +133,7 @@ class Php74 < Package def self.install ENV['CREW_FHS_NONCOMPLIANCE_ONLY_ADVISORY'] = '1' - warn_level = $VERBOSE - $VERBOSE = nil - load "#{CREW_LIB_PATH}lib/const.rb" - $VERBOSE = warn_level + reload_constants FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/bin" FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/tmp/run" FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/etc/init.d" diff --git a/packages/php80.rb b/packages/php80.rb index d2d5a0711..31f707bd2 100644 --- a/packages/php80.rb +++ b/packages/php80.rb @@ -135,10 +135,7 @@ class Php80 < Package def self.install ENV['CREW_FHS_NONCOMPLIANCE_ONLY_ADVISORY'] = '1' - warn_level = $VERBOSE - $VERBOSE = nil - load "#{CREW_LIB_PATH}lib/const.rb" - $VERBOSE = warn_level + reload_constants FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/bin" FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/tmp/run" FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/etc/init.d" diff --git a/packages/php81.rb b/packages/php81.rb index e844c9b8e..81d3b6160 100644 --- a/packages/php81.rb +++ b/packages/php81.rb @@ -135,10 +135,7 @@ class Php81 < Package def self.install ENV['CREW_FHS_NONCOMPLIANCE_ONLY_ADVISORY'] = '1' - warn_level = $VERBOSE - $VERBOSE = nil - load "#{CREW_LIB_PATH}lib/const.rb" - $VERBOSE = warn_level + reload_constants FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/bin" FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/tmp/run" FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/etc/init.d" diff --git a/packages/qtlocation.rb b/packages/qtlocation.rb index 1d87e016d..adcf62439 100644 --- a/packages/qtlocation.rb +++ b/packages/qtlocation.rb @@ -30,10 +30,7 @@ class Qtlocation < Package def self.install ENV['CREW_CONFLICTS_ONLY_ADVISORY'] = '1' - warn_level = $VERBOSE - $VERBOSE = nil - load "#{CREW_LIB_PATH}lib/const.rb" - $VERBOSE = warn_level + reload_constants FileUtils.mkdir_p "#{CREW_DEST_LIB_PREFIX}" FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/share/Qt-5" FileUtils.cp_r Dir['lib/*'], "#{CREW_DEST_LIB_PREFIX}" diff --git a/packages/qtmultimedia.rb b/packages/qtmultimedia.rb index 0d6487123..317942911 100644 --- a/packages/qtmultimedia.rb +++ b/packages/qtmultimedia.rb @@ -30,10 +30,7 @@ class Qtmultimedia < Package def self.install ENV['CREW_CONFLICTS_ONLY_ADVISORY'] = '1' - warn_level = $VERBOSE - $VERBOSE = nil - load "#{CREW_LIB_PATH}lib/const.rb" - $VERBOSE = warn_level + reload_constants FileUtils.mkdir_p CREW_DEST_LIB_PREFIX FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/share/Qt-5" FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/share/Qt-5/plugins/mediaservice" diff --git a/packages/qtscript.rb b/packages/qtscript.rb index d8a54d7e5..939098e10 100644 --- a/packages/qtscript.rb +++ b/packages/qtscript.rb @@ -30,10 +30,7 @@ class Qtscript < Package def self.install ENV['CREW_CONFLICTS_ONLY_ADVISORY'] = '1' - warn_level = $VERBOSE - $VERBOSE = nil - load "#{CREW_LIB_PATH}lib/const.rb" - $VERBOSE = warn_level + reload_constants FileUtils.mkdir_p "#{CREW_DEST_LIB_PREFIX}" FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/share/Qt-5" FileUtils.cp_r Dir['lib/*'], "#{CREW_DEST_LIB_PREFIX}" diff --git a/packages/qtserialport.rb b/packages/qtserialport.rb index 4f8e7521e..f103d788b 100644 --- a/packages/qtserialport.rb +++ b/packages/qtserialport.rb @@ -30,10 +30,7 @@ class Qtserialport < Package def self.install ENV['CREW_CONFLICTS_ONLY_ADVISORY'] = '1' - warn_level = $VERBOSE - $VERBOSE = nil - load "#{CREW_LIB_PATH}lib/const.rb" - $VERBOSE = warn_level + reload_constants FileUtils.mkdir_p "#{CREW_DEST_LIB_PREFIX}" FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/share/Qt-5" FileUtils.cp_r Dir['lib/*'], "#{CREW_DEST_LIB_PREFIX}" diff --git a/packages/qtwayland.rb b/packages/qtwayland.rb index 27c350b74..88904a6fc 100644 --- a/packages/qtwayland.rb +++ b/packages/qtwayland.rb @@ -32,10 +32,7 @@ class Qtwayland < Package def self.install ENV['CREW_CONFLICTS_ONLY_ADVISORY'] = '1' - warn_level = $VERBOSE - $VERBOSE = nil - load "#{CREW_LIB_PATH}lib/const.rb" - $VERBOSE = warn_level + reload_constants FileUtils.mkdir_p "#{CREW_DEST_LIB_PREFIX}" FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/share/Qt-5" FileUtils.cp_r Dir['lib/*'], "#{CREW_DEST_LIB_PREFIX}" diff --git a/packages/teams.rb b/packages/teams.rb index a1d8647cb..0351bb87f 100644 --- a/packages/teams.rb +++ b/packages/teams.rb @@ -26,10 +26,7 @@ class Teams < Package def self.install ENV['CREW_NOT_SHRINK_ARCHIVE'] = '1' - warn_level = $VERBOSE - $VERBOSE = nil - load "#{CREW_LIB_PATH}lib/const.rb" - $VERBOSE = warn_level + reload_constants FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/bin" FileUtils.mv 'share', CREW_DEST_PREFIX FileUtils.install 'teams.sh', "#{CREW_DEST_PREFIX}/bin/teams", mode: 0o755 diff --git a/packages/webkit2gtk_5.rb b/packages/webkit2gtk_5.rb index 9f59c098e..87ab16cc3 100644 --- a/packages/webkit2gtk_5.rb +++ b/packages/webkit2gtk_5.rb @@ -96,10 +96,7 @@ class Webkit2gtk_5 < Package def self.install ENV['CREW_FHS_NONCOMPLIANCE_ONLY_ADVISORY'] = '1' - warn_level = $VERBOSE - $VERBOSE = nil - load "#{CREW_LIB_PATH}lib/const.rb" - $VERBOSE = warn_level + reload_constants system "DESTDIR=#{CREW_DEST_DIR} samu -C builddir5 install" end end