fix 7z unpacking errors, allow correct force_unzip ops

jsta · Jan 27, 2021 · e225d07 · e225d07
1 parent c19c001
commit e225d07
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/R/get.R b/R/get.R
@@ -92,16 +92,15 @@ nhd_plus_get <- function(vpu = NA, component = "NHDSnapshot", force_dl = FALSE,
     if(!has_7z()$yes){
       stop("The 7-zip program is needed to unpack NHD downloads (http://www.7-zip.org/).")
     }
-    system(paste0(has_7z()$path, " e ", shQuote(destfile),
-                  " -o", shQuote(destsubdir)))
+    system(paste0(has_7z()$path, " e -y ", shQuote(normalizePath(destfile)),
+                  " -o", shQuote(normalizePath(destsubdir))))
   }else{
     if(get_if_not_exists(url, destfile, force_dl = force_dl)){
       if(!has_7z()$yes){
         stop("The 7-zip program is needed to unpack NHD downloads (http://www.7-zip.org/).")
       }
-      system(paste0(has_7z()$path, " e ", shQuote(destfile),
-                    " -o", shQuote(destsubdir)))
+      system(paste0(has_7z()$path, " e ", shQuote(normalizePath(destfile)),
+                    " -o", shQuote(normalizePath(destsubdir))))
     }
   }
 }
-