rbt 0.16.13 → 0.16.15

data/lib/rbt/actions/individual_actions/software_manager/logic_related_code.rb

@@ -356,9 +356,9 @@ class SoftwareManager < RBT::Action # === RBT::Action::SoftwareManager
       if use_meson_configure_options?
         configure_options = meson_configure_options?.to_s.strip
         if configure_options and !configure_options.empty?
-          # ==================================================================== #
+          # ================================================================== #
           # Append the meson-configure options in this case.
-          # ==================================================================== #
+          # ================================================================== #
           orev "Making use of the #{royalblue('meson_configure_options')}#{rev}, "\
                "#{rev}as specified by the corresponding "\
                "#{slateblue('.yml')} #{rev}file."
@@ -638,22 +638,22 @@ class SoftwareManager < RBT::Action # === RBT::Action::SoftwareManager
          can_we_continue? #and
         #!a_problem_has_occurred? and # Also check for no problem.
         #!an_error_has_occurred?
-        # ====================================================================== #
+        # ==================================================================== #
         # Build up the command to run next.
-        # ====================================================================== #
+        # ==================================================================== #
         cmd_to_run = 'ldconfig'.dup
-        # ====================================================================== #
+        # ==================================================================== #
         # We could be verbose, but it is not that useful, so uncomment it.
         # cmd_to_run << ' -v'
-        # ====================================================================== #
+        # ==================================================================== #
         # Since as of July 2011, we will be quieter and ignore whether
         # ldconfig exists or not.
-        # ====================================================================== #
+        # ==================================================================== #
         cmd_to_run << " #{SHELL_ERROR_CODE}"
-        # ====================================================================== #
+        # ==================================================================== #
         # Check for superuser privilege next. ldconfig requires the
         # superuser.
-        # ====================================================================== #
+        # ==================================================================== #
         if is_superuser?
           orev "Now running `#{sfancy(cmd_to_run)}#{rev}`." # We output the ldconfig command variant here.
           system cmd_to_run
@@ -883,10 +883,10 @@ class SoftwareManager < RBT::Action # === RBT::Action::SoftwareManager
       else
         run_this_command = "#{do_this_action}".dup
         if run_this_command.start_with?('python') and !run_this_command.include?('/')
-          # ==================================================================== #
+          # ================================================================== #
           # This is valid for a command line such as:
           #   "python setup.py config"
-          # ==================================================================== #
+          # ================================================================== #
           splitted = run_this_command.split(' ')
           splitted[1].prepend(configure_base_dir?.dup)
           run_this_command = splitted.join(' ')
@@ -1100,10 +1100,10 @@ class SoftwareManager < RBT::Action # === RBT::Action::SoftwareManager
         if porg_is_available?
           use_porg = true
         else
-          # ==================================================================== #
+          # ================================================================== #
           # Notify the user that porg is NOT available. We will continue
           # anyway, though.
-          # ==================================================================== #
+          # ================================================================== #
           notify_the_user_that_porg_is_not_available
         end
       end
@@ -1330,9 +1330,9 @@ class SoftwareManager < RBT::Action # === RBT::Action::SoftwareManager
           # In this case all is fine.
         else
           compile_this_program = compile_which_program?
-          # ==================================================================== #
+          # ================================================================== #
           # Else it is a not-registered binary, so report it.
-          # ==================================================================== #
+          # ================================================================== #
           cliner
           opne crimson('The entry ')+steelblue(entry)+
                crimson(' is not a registered')
@@ -1341,10 +1341,10 @@ class SoftwareManager < RBT::Action # === RBT::Action::SoftwareManager
                crimson('.')
           opne olivedrab('^^^ Consider changing this. ^^^')
           cliner
-          # ==================================================================== #
+          # ================================================================== #
           # Since as of 09.12.2019 we will also store this result into a
           # log file.
-          # ==================================================================== #
+          # ================================================================== #
           what = "#{entry} belongs to the program called "\
                  "#{rarrow?} #{compile_this_program}"
           into = "#{log_dir?}these_binaries.yml"
@@ -1674,29 +1674,6 @@ class SoftwareManager < RBT::Action # === RBT::Action::SoftwareManager
   end; alias do_show_the_infobox consider_showing_the_flexbox # === do_show_the_infobox
        alias infobox_for         consider_showing_the_flexbox # === infobox_for
 
-  # ========================================================================== #
-  # === consider_removing_the_old_extracted_directory_if_it_exists
-  # ========================================================================== #
-  def consider_removing_the_old_extracted_directory_if_it_exists(
-      i = remove_archive_stuff_from_the_end(will_be_extracted_towards?)
-    )
-    i = rds(i) if i.include?('//')
-    # ======================================================================= #
-    # We also check whether the target is or appears to be under the
-    # log-directory that RBT uses.
-    # ======================================================================= #
-    if File.directory?(i) and i.include?(log_dir?) and !(i == '/')
-      if i == log_dir? # The log-directory can not be removed via this method.
-        orev "Can not remove #{sdir(i)}#{rev}."
-      else
-        orev "#{steelblue('Removing')}#{rev}"\
-             " the old, extracted directory at #{sdir(i)}"\
-             "#{rev} next."
-        remove_directory(i)
-      end
-    end
-  end
-
   # ======================================================================= #
   # === notify_the_user_as_to_which_program_will_be_compiled_or_installed_next
   #
@@ -1932,6 +1909,9 @@ class SoftwareManager < RBT::Action # === RBT::Action::SoftwareManager
         set_cflags(:build_static)
       end
     end
+    if extract_to_this_directory_as_specified_by_the_user?
+      cookbook_dataset?.set_extract_to(extract_to_this_directory_as_specified_by_the_user?)
+    end
     # ======================================================================== #
     # === (2) Next we will show the infobox, also called Flexbox (flexbox tag, infobox tag)
     #
@@ -2107,10 +2087,14 @@ class SoftwareManager < RBT::Action # === RBT::Action::SoftwareManager
         orev "`#{sfile(to)}#{rev}`,"
         orev 'if the extraction-step worked properly.'
         # ==================================================================== #
-        # === (5) Extracting the archive next:
+        # === (5) Extracting the archive next
+        #
+        # We will next extract the source archive to the target directory.
         # ==================================================================== #
-        extract_what_to(local_path, File.dirname(to))
+        new_target = File.dirname(to)
+        extract_what_to(local_path, new_target)
         orev lightsalmon('The extraction-step has finished.')
+        cd(to)
       end
       # ====================================================================== #
       # Next, exit if this was specified that way, that we only wish to
@@ -2151,9 +2135,9 @@ class SoftwareManager < RBT::Action # === RBT::Action::SoftwareManager
         # honour the configure_base_dir setting.
         # ==================================================================== #
         cd_into_this_directory = rds(
-          log_dir?+
-          program_name_and_program_version?+'/'+
-          configure_base_directory?.to_s+'/'
+          "#{extract_to_this_directory?}"\
+          "#{program_name_and_program_version?}/"\
+          "#{configure_base_directory?.to_s}/"
         )
         unless configure_base_directory?.empty? or (configure_base_directory? == '/')
           orev "Entering the #{steelblue('configure-base-directory')}#{rev}"\
@@ -2242,39 +2226,27 @@ class SoftwareManager < RBT::Action # === RBT::Action::SoftwareManager
           orev sdir(build_directory_object?.path?)+rev+'.'
         end
         run_the_equivalent_configure_like_stage_for_this_program(i)
-        unless keep_extracted?
-          # ==================================================================== #
-          # === Remove the extracted archive / directory
-          #
-          # We have to clean-up again, by removing the extracted archive. This
-          # behaviour can be changed by the user, though. Additionally, the
-          # individual .yml file may decide for us whether we will remove the
-          # extracted directory or whether we will keep that directory. User
-          # instructions overrule the settings in the .yml file, though.
-          # ==================================================================== #
-          consider_removing_the_old_extracted_directory_if_it_exists
-        end
         # ==================================================================== #
         # Consider stripping the compiled binaries.
         # ==================================================================== #
         if had_to_be_compiled?
-          # ==================================================================== #
+          # ================================================================== #
           # Next check whether we have to strip the compiled binaries or
           # whether we do not have to strip them. The checks are done
           # with the method itself, so we don't have to do any conditional
           # checks here at this point.
-          # ==================================================================== #
+          # ================================================================== #
           do_strip_the_compiled_binaries
-          # ==================================================================== #
+          # ================================================================== #
           # Next, we will consider creating and populating the subdirectory
           # called "lib/pkgconfig/". This may be necessary for programs that
           # install into "share/pkgconfig/" rather than "lib/pkgconfig".
           #
           # This step has to be done before we call the method
           # consider_symlinking_the_pkgconfig_files().
-          # ==================================================================== #
+          # ================================================================== #
           consider_creating_and_populating_the_pkgconfig_directory
-          # ==================================================================== #
+          # ================================================================== #
           # If the cookbook file at hand has symlinking_pkgconfig_files
           # enabled, and if the program is compiled, as AppDir, then we
           # will symlink .pc iles into /usr/lib/pkgconfig/, if the
@@ -2282,9 +2254,9 @@ class SoftwareManager < RBT::Action # === RBT::Action::SoftwareManager
           #
           # This should actually be part of the post-installation actions,
           # but before running ldconfig.
-          # ==================================================================== #
+          # ================================================================== #
           consider_symlinking_the_pkgconfig_files
-          # ==================================================================== #
+          # ================================================================== #
           # === Handle empty subdirectories
           #
           # Next we will consider removing empty subdirectories. This has to
@@ -2296,38 +2268,48 @@ class SoftwareManager < RBT::Action # === RBT::Action::SoftwareManager
           # should NOT be removed, even if they are empty - such as temp or
           # logs directories called during the post-installation step. So
           # we have to include that as well.
-          # ==================================================================== #
+          # ================================================================== #
           consider_removing_empty_subdirectories
-          # ==================================================================== #
+          # ================================================================== #
           # Store the time it took to compile the program at hand.
-          # ==================================================================== #
+          # ================================================================== #
           store_time_snapshot
           consider_creating_a_log_file_containing_information_about_the_used_environment_and_time_of_compilation
-          # ==================================================================== #
+          # ================================================================== #
           # Report to the user how long it took us to compile/install the program
           # at hand.
-          # ==================================================================== #
+          # ================================================================== #
           consider_reporting_the_time_it_took_to_compile_this_program
-          # ==================================================================== #
+          # ================================================================== #
           # Next register the configure-line into the configure "database",
           # unless a problem or error has occurred.
-          # ==================================================================== #
+          # ================================================================== #
           # if no_problem_was_encountered? and
           #    no_error_was_encountered?
-          # ==================================================================== #
+          # ================================================================== #
           # Register the configure-line that was used into the "global"
           # configure database next - this should come before we symlink
           # the .pc files:
-          # ==================================================================== #
+          # ================================================================== #
           register_configure_line_into_configure_database
-          # ==================================================================== #
+          # ================================================================== #
+          # === Remove the extracted archive / directory
+          #
+          # We have to clean-up again, by removing the extracted archive. This
+          # behaviour can be changed by the user, though. Additionally, the
+          # individual .yml file may decide for us whether we will remove the
+          # extracted directory or whether we will keep that directory. User
+          # instructions overrule the settings in the .yml file, though.
+          # ================================================================== #
+          consider_removing_the_extracted_source_archive_directory
+          # ================================================================== #
           # Go back into the starting directory again.
-          # ==================================================================== #
+          # ================================================================== #
           consider_entering_the_log_directory
           show_the_everything_is_finished_message
-          # ==================================================================== #
+          # ================================================================== #
           # Show success or failure - this should come last.
-          # ==================================================================== #
+          # ================================================================== #
           show_success_or_failure_status
         end
         # ==================================================================== #

data/lib/rbt/actions/individual_actions/software_manager/menu.rb

@@ -37,6 +37,98 @@ class SoftwareManager < RBT::Action # === RBT::Action::SoftwareManager
     else
       case i # (case tag, cas tag)
       # ===================================================================== #
+      # === Set extract to
+      #
+      # Specify our target directory for extracting an archive. Special
+      # shortcuts, such as pwd for "current working directry", also
+      # exist.
+      #
+      # Usage examples:
+      #
+      #   ry htop --extract_to=pwd
+      #   ry htop --base-dir=/tmp/
+      #   ry htop --base-dir=/opt/
+      #   ry htop --extract-to=/opt/test
+      #   ry mesa --use-this-as-temp-dir=/opt/foo
+      #   ry htop ntrad --use-this-temp-dir=/opt/foobar_create_it
+      #
+      # ===================================================================== #
+      when /^-?-?extract(_|-| )?to=(.*)$/,                                      # === $2
+           /^-?-?temp(_|-| )?dir=(.*)$/,                                        # === $2
+           /^-?-?use(_|-| )?temp(_|-| )?dir=(.*)$/,                             # === $3
+           /^-?-?base(_|-| )?dir=(.+)$/,                                        # === $2
+           /^-?-?use(_|-| )?this(_|-| )?temp(_|-| )?directory=(.*)$/,           # === $4
+           /^-?-?use(_|-| )?this(_|-| )?temp(_|-| )?dir=(.*)$/,                 # === $4
+           /^-?-?use(_|-| )?this(_|-| )?as(_|-| )?temp(_|-| )?dir=(.*)$/,       # === $5
+           /^-?-?use(_|-| )?this(_|-| )?as(_|-| )?temp(_|-| )?directory=(.*)$/, # === $4
+           /^-?e=(.*)$/                                                         # === $1
+        _ = $1.to_s.dup
+        _ = $2.to_s.dup if $2
+        _ = $3.to_s.dup if $3
+        _ = $4.to_s.dup if $4
+        _ = $5.to_s.dup if $5
+        set_extract_to_this_directory_as_specified_by_the_user(_)
+      # ===================================================================== #
+      # === Query where we will extract to
+      #
+      # This entry point can be used to determine where to we will extract
+      # archives.
+      #
+      # Invocation example:
+      #
+      #   ry --extract-to?
+      #
+      # ===================================================================== #
+      when /^-?-?extract(-|_)?to\??$/i
+        report_where_archives_will_be_extracted_into
+        exit_program
+      # ===================================================================== #
+      # === Keep the archive extracted
+      #
+      # The user can use this entry point if he/she dodoes not want
+      # to delete the extracted archive again.
+      #
+      # Keep our source archive extracted:
+      #
+      #   ry htop ke
+      #
+      # ===================================================================== #
+      when *ARRAY_HELP_KEEP_EXTRACTED_OPTIONS
+        do_retain_the_extracted_source_archive
+      # ===================================================================== #
+      # === Do not keep the archive
+      #
+      # After extracting and compiling, we will get rid of the archive
+      # again. We will get rid of the archive independent over whether
+      # the installation process was a success or whether it was not,
+      # mind you. 
+      #
+      # Usage examples:
+      #
+      #   ry htop --remove-archive
+      #   ry htop dontkeeparchive
+      #
+      # ===================================================================== #
+      when *ARRAY_HELP_DONT_KEEP_EXTRACTED_OPTIONS
+        set_dont_keep_archive # Remove archive(s) after a successful build.
+      # ===================================================================== #
+      # === Do not remove empty directories
+      #
+      # This entry point exists so that we can keep empty directories
+      # in the respective /Programs/PROGRAM_NAME/PROGRAM_VERSION/
+      # subdirectory.
+      #
+      # Invocation examples:
+      #
+      #   rbt feh --ntrad --do-not-remove-empty-directories
+      #   rbt htop --ntrad --do-not-remove-empty-directories
+      #
+      # ===================================================================== #
+      when /^-?-?do(-|_| )?not(-|_| )?remove(-|_| )?empty(-|_| )?directories$/
+        opne slateblue('class RBT::SymlinkProgram')+' will '+
+             crimson('not')+' remove empty directories.'
+        symlink_program?.do_keep_empty_directories
+      # ===================================================================== #
       # === Generate a big shell script
       #
       # This entry point can be used to quickly generate the big
@@ -2578,22 +2670,6 @@ class SoftwareManager < RBT::Action # === RBT::Action::SoftwareManager
            'rall'
         compile_all_programs(:do_exit_afterwards) # Argument true for "shall we exit".
       # ===================================================================== #
-      # === Do not keep the archive
-      #
-      # After extracting and compiling, we will get rid of the archive
-      # again. We will get rid of the archive independent over whether
-      # the installation process was a success or whether it was not,
-      # mind you. 
-      #
-      # Usage examples:
-      #
-      #   ry htop --remove-archive
-      #   ry htop dontkeeparchive
-      #
-      # ===================================================================== #
-      when *ARRAY_HELP_DONT_KEEP_EXTRACTED_OPTIONS
-        set_dont_keep_archive # Remove archive(s) after a successful build.
-      # ===================================================================== #
       # === Download a remote program into a given directory at hand
       #
       # This entry point allows us to download a remote program into
@@ -2724,20 +2800,6 @@ class SoftwareManager < RBT::Action # === RBT::Action::SoftwareManager
         pin_this_program(this_program)
         exit_program
       # ===================================================================== #
-      # === Query where we will extract to
-      #
-      # This entry point can be used to determine where to we will extract
-      # archives.
-      #
-      # Invocation example:
-      #
-      #   rbt --extract-to?
-      #
-      # ===================================================================== #
-      when /^-?-?extract(-|_)?to\??$/i
-        report_where_archives_will_be_extracted_into
-        exit_program
-      # ===================================================================== #
       # === Query whether we are on windows
       #
       # This entry point can be quickly used to determine whether we are
@@ -4557,40 +4619,6 @@ class SoftwareManager < RBT::Action # === RBT::Action::SoftwareManager
         try_to_show_the_BLFS_content_of_this_program
         exit_program
       # ===================================================================== #
-      # === Set extract to
-      #
-      # Specify our target directory for extracting an archive. Special
-      # shortcuts, such as pwd for "current working directry", also
-      # exist.
-      #
-      # Usage examples:
-      #
-      #   ry htop --extract_to=pwd
-      #   ry htop --base-dir=/tmp/
-      #   ry htop --base-dir=/opt/
-      #   ry htop --extract-to=/opt/test
-      #   ry mesa --use-this-as-temp-dir=/opt/foo
-      #   ry htop ntrad --use-this-temp-dir=/opt/foobar_create_it
-      #
-      # ===================================================================== #
-      when /^-?-?extract(_|-| )?to=(.*)$/,                                      # === $2
-           /^-?-?temp(_|-| )?dir=(.*)$/,                                        # === $2
-           /^-?-?use(_|-| )?temp(_|-| )?dir=(.*)$/,                             # === $3
-           /^-?-?base(_|-| )?dir=(.+)$/,                                        # === $2
-           /^-?-?use(_|-| )?this(_|-| )?temp(_|-| )?directory=(.*)$/,           # === $4
-           /^-?-?use(_|-| )?this(_|-| )?temp(_|-| )?dir=(.*)$/,                 # === $4
-           /^-?-?use(_|-| )?this(_|-| )?as(_|-| )?temp(_|-| )?dir=(.*)$/,       # === $5
-           /^-?-?use(_|-| )?this(_|-| )?as(_|-| )?temp(_|-| )?directory=(.*)$/, # === $4
-           /^-?e=(.*)$/                                                         # === $1
-        _ = $1.to_s.dup
-        _ = $2.to_s.dup if $2
-        _ = $3.to_s.dup if $3
-        _ = $4.to_s.dup if $4
-        _ = $5.to_s.dup if $5
-        set_extract_to_this_directory_as_specified_by_the_user(
-          _
-        )
-      # ===================================================================== #
       # === Show whether RBT uses ccache or whether it does not
       #
       # This entry point just queries whether RBT will be making use of
@@ -6220,23 +6248,6 @@ class SoftwareManager < RBT::Action # === RBT::Action::SoftwareManager
         install_palemoon
         exit_program
       # ===================================================================== #
-      # === Do not remove empty directories
-      #
-      # This entry point exists so that we can keep empty directories
-      # in the respective /Programs/PROGRAM_NAME/PROGRAM_VERSION/
-      # subdirectory.
-      #
-      # Invocation examples:
-      #
-      #   rbt feh --ntrad --do-not-remove-empty-directories
-      #   rbt htop --ntrad --do-not-remove-empty-directories
-      #
-      # ===================================================================== #
-      when /^-?-?do(-|_| )?not(-|_| )?remove(-|_| )?empty(-|_| )?directories$/
-        opne slateblue('class RBT::SymlinkProgram')+' will '+
-             crimson('not')+' remove empty directories.'
-        symlink_program?.do_keep_empty_directories
-      # ===================================================================== #
       # === Perform an intelligent bootstrap-operation
       #
       # This entry point has been added in November 2020, as means to
@@ -8945,19 +8956,6 @@ class SoftwareManager < RBT::Action # === RBT::Action::SoftwareManager
       when /^-?-?LC_?ALL$/i
         ENV['LC_ALL'] = 'C'
       # ===================================================================== #
-      # === Keep the archive extracted
-      #
-      # The user can use this entry point if he/she dodoes not want
-      # to delete the extracted archive again.
-      #
-      # Keep our source archive extracted:
-      #
-      #   ry htop ke
-      #
-      # ===================================================================== #
-      when *ARRAY_HELP_KEEP_EXTRACTED_OPTIONS
-        do_set_keep_extracted
-      # ===================================================================== #
       # === Check for the latest program
       #
       # Check for the latest program: