Use run

Author: minhqdao

src/fpm/downloader.f90

@@ -1,6 +1,6 @@
 module fpm_downloader
   use fpm_error, only: error_t, fatal_error
-  use fpm_filesystem, only: which
+  use fpm_filesystem, only: which, run
   use fpm_versioning, only: version_t
   use jonquil, only: json_object, json_value, json_error, json_load, cast_to_object
   use fpm_strings, only: string_t
@@ -81,25 +81,23 @@ subroutine upload_form(endpoint, form_data, verbose, error)
     character(len=*), intent(in) :: endpoint
     !> Form data to upload.
     type(string_t), intent(in) :: form_data(:)
-    !> Print additional information when true.
+    !> Print additional information if true.
     logical, intent(in) :: verbose
     !> Error handling.
     type(error_t), allocatable, intent(out) :: error
 
     integer :: stat, i
-    character(len=:), allocatable :: form_data_str, cmd
+    character(len=:), allocatable :: form_data_str
 
     form_data_str = ''
     do i = 1, size(form_data)
       form_data_str = form_data_str//"-F '"//form_data(i)%s//"' "
     end do
 
-    cmd = 'curl -X POST -H "Content-Type: multipart/form-data" '//form_data_str//endpoint
-
     if (which('curl') /= '') then
       print *, 'Uploading package ...'
-      if (verbose) print *, ' + ', cmd
-      call execute_command_line(cmd, exitstat=stat)
+      call run('curl -X POST -H "Content-Type: multipart/form-data" '// &
+      & form_data_str//endpoint, exitstat=stat, verbose=verbose)
     else
       call fatal_error(error, "'curl' not installed."); return
     end if

src/fpm/git.f90

@@ -1,7 +1,8 @@
 !> Implementation for interacting with git repositories.
 module fpm_git
     use fpm_error, only: error_t, fatal_error
-    use fpm_filesystem, only : get_temp_filename, getline, join_path, execute_and_read_output
+    use fpm_filesystem, only : get_temp_filename, getline, join_path, execute_and_read_output, run
+
     implicit none
 
     public :: git_target_t, git_target_default, git_target_branch, git_target_tag, git_target_revision, git_revision, &
@@ -321,35 +322,18 @@ subroutine git_archive(source, destination, ref, verbose, error)
     type(error_t), allocatable, intent(out) :: error
 
     integer :: stat
-    character(len=:), allocatable :: cmd_output, archive_format, cmd
-
-    if (verbose) then
-      print *, ''
-      print *, 'Show git archive options:'
-      print *, ' + git archive -l'
-    end if
+    character(len=:), allocatable :: cmd_output, archive_format
 
-    call execute_and_read_output('git archive -l', cmd_output, error)
+    call execute_and_read_output('git archive -l', cmd_output, error, verbose)
     if (allocated(error)) return
 
-    if (verbose) print *, ' ', cmd_output
-
     if (index(cmd_output, 'tar.gz') /= 0) then
       archive_format = 'tar.gz'
     else
       call fatal_error(error, "Cannot find a suitable archive format for 'git archive'."); return
     end if
 
-    cmd = 'git archive '//ref//' --format='//archive_format//' -o '//destination
-
-    if (verbose) then
-      print *, ''
-      print *, 'Archive ', ref, ' using ', archive_format, ':'
-      print *, ' + ', cmd
-      print *, ''
-    end if
-
-    call execute_command_line(cmd, exitstat=stat)
+    call run('git archive '//ref//' --format='//archive_format//' -o '//destination, echo=verbose, exitstat=stat)
     if (stat /= 0) then
       call fatal_error(error, "Error packing '"//source//"'."); return
     end if

src/fpm_filesystem.F90

@@ -1083,24 +1083,31 @@ subroutine get_home(home, error)
     end subroutine get_home
 
     !> Execute command line and return output as a string.
-    subroutine execute_and_read_output(cmd, output, error, exitstat)
+    subroutine execute_and_read_output(cmd, output, error, verbose)
         !> Command to execute.
         character(len=*), intent(in) :: cmd
         !> Command line output.
         character(len=:), allocatable, intent(out) :: output
         !> Error to handle.
         type(error_t), allocatable, intent(out) :: error
-        !> Can optionally used for error handling.
-        integer, intent(out), optional :: exitstat
+        !> Print additional information if true.
+        logical, intent(in), optional :: verbose
 
-        integer :: cmdstat, unit, stat = 0
+        integer :: exitstat, unit, stat = 0
         character(len=:), allocatable :: cmdmsg, tmp_file
         character(len=1000) :: output_line
+        logical :: is_verbose
+
+        if (present(verbose)) then
+          is_verbose = verbose
+        else
+          is_verbose = .false.
+        end if
 
         tmp_file = get_temp_filename()
 
-        call execute_command_line(cmd//' > '//tmp_file, exitstat=exitstat, cmdstat=cmdstat)
-        if (cmdstat /= 0) call fatal_error(error, '*run*: '//"Command failed: '"//cmd//"'. Message: '"//trim(cmdmsg)//"'.")
+        call run(cmd//' > '//tmp_file, exitstat=exitstat, echo=is_verbose)
+        if (exitstat /= 0) call fatal_error(error, '*run*: '//"Command failed: '"//cmd//"'. Message: '"//trim(cmdmsg)//"'.")
 
         open(newunit=unit, file=tmp_file, action='read', status='old')
         output = ''
@@ -1109,6 +1116,7 @@ subroutine execute_and_read_output(cmd, output, error, exitstat)
           if (stat /= 0) exit
           output = output//trim(output_line)//' '
         end do
+        if (is_verbose) print *, output
         close(unit, status='delete')
     end