Clean up code and delete file after use

Author: minhqdao

src/fpm/cmd/publish.f90

@@ -8,7 +8,7 @@ module fpm_cmd_publish
   use fpm_model, only: fpm_model_t
   use fpm_error, only: error_t, fpm_stop
   use fpm_versioning, only: version_t
-  use fpm_filesystem, only: exists, join_path, get_temp_filename
+  use fpm_filesystem, only: exists, join_path, get_temp_filename, delete_file
   use fpm_git, only: git_archive
   use fpm_downloader, only: downloader_t
   use fpm_strings, only: string_t
@@ -64,34 +64,37 @@ subroutine cmd_publish(settings)
       end if
     end do
 
+    tmp_file = get_temp_filename()
+    call git_archive('.', tmp_file, error)
+    if (allocated(error)) call fpm_stop(1, '*cmd_publish* Archive error: '//error%message)
+
     upload_data = [ &
-      string_t('package_name="'//package%name//'"'), &
-      string_t('package_license="'//package%license//'"'), &
-      string_t('package_version="'//version%s()//'"') &
-      & ]
+    & string_t('package_name="'//package%name//'"'), &
+    & string_t('package_license="'//package%license//'"'), &
+    & string_t('package_version="'//version%s()//'"'), &
+    & string_t('tarball=@"'//tmp_file//'"') &
+    & ]
 
     if (allocated(settings%token)) upload_data = [upload_data, string_t('upload_token="'//settings%token//'"')]
 
-    tmp_file = get_temp_filename()
-    call git_archive('.', tmp_file, error)
-    if (allocated(error)) call fpm_stop(1, '*cmd_publish* Pack error: '//error%message)
-    upload_data = [upload_data, string_t('tarball=@"'//tmp_file//'"')]
-
     if (settings%show_upload_data) then
       do i = 1, size(upload_data)
         print *, upload_data(i)%s
       end do
-      return
+      call delete_file(tmp_file); return
     end if
 
     ! Make sure a token is provided for publishing.
     if (allocated(settings%token)) then
-      if (settings%token == '') call fpm_stop(1, 'No token provided.')
+      if (settings%token == '') then
+        call delete_file(tmp_file); call fpm_stop(1, 'No token provided.')
+      end if
     else
-      call fpm_stop(1, 'No token provided.')
+      call delete_file(tmp_file); call fpm_stop(1, 'No token provided.')
     end if
 
     call downloader%upload_form(official_registry_base_url//'/packages', upload_data, error)
+    call delete_file(tmp_file)
     if (allocated(error)) call fpm_stop(1, '*cmd_publish* Upload error: '//error%message)
   end
 end

src/fpm/git.f90

@@ -328,7 +328,7 @@ subroutine git_archive(source, destination, error)
       call fatal_error(error, "Cannot find a suitable archive format for 'git archive'."); return
     end if
 
-    call execute_command_line('git archive HEAD --format='//archive_format//' -o '// destination, exitstat=stat)
+    call execute_command_line('git archive HEAD --format='//archive_format//' -o '//destination, exitstat=stat)
     if (stat /= 0) then
       call fatal_error(error, "Error packing '"//source//"'."); return
     end if