fix error in ct_migrate_cache towards better accounting for only one …

…of the two dirs being present
ropensci · May 23, 2024 · d686025 · d686025
1 parent 49c9297
commit d686025
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/R/utils.R b/R/utils.R
@@ -71,8 +71,9 @@ ct_migrate_cache <- function(){
     cli::cli_abort('x' = 'Something went wrong while copying.')
   }
 
-  fs::dir_delete(rappdirs::user_cache_dir('comtradr'))
-
+  if(fs::dir_exists(rappdirs::user_cache_dir('comtradr'))){
+    fs::dir_delete(rappdirs::user_cache_dir('comtradr'))
+  }
   ## as above but for the bulk cache directory
   if((rappdirs::user_cache_dir('comtradr_bulk')!=
       tools::R_user_dir('comtradr_bulk', which = 'cache')) &&
@@ -85,7 +86,9 @@ ct_migrate_cache <- function(){
           list.files(tools::R_user_dir('comtradr_bulk', which = 'cache')))){
     cli::cli_abort('x' = 'Something went wrong while copying.')
   }
-  fs::dir_delete(rappdirs::user_cache_dir('comtradr_bulk'))
+  if(fs::dir_exists(rappdirs::user_cache_dir('comtradr_bulk'))){
+    fs::dir_delete(rappdirs::user_cache_dir('comtradr_bulk'))
+  }
 }
 
 #' Get reference table from package data

diff --git a/inst/WORDLIST b/inst/WORDLIST
@@ -1,6 +1,7 @@
 ASEAN
 CMD
 COMTRADE
+Comtrade
 Codecov
 Comtrade
 EB