@@ -367,15 +367,21 @@ GDCclientInstall <- function() {
367367 },
368368 error = function (e ) {
369369 c(
370- " https://gdc.cancer.gov/files/public/file/gdc-client_v1.6.1_Ubuntu_x64 .zip" ,
371- " https://gdc.cancer.gov/files/public/file/gdc-client_v1.6.1_Windows_x64 .zip" ,
372- " https://gdc.cancer.gov/files/public/file/gdc-client_v1.6.1_OSX_x64 .zip"
370+ " https://gdc.cancer.gov/system/ files/public/file/gdc-client_2.3_Ubuntu_x64-py3.8-ubuntu-20.04 .zip" ,
371+ " https://gdc.cancer.gov/system/ files/public/file/gdc-client_2.3_Windows_x64-py3.8-windows-2019 .zip" ,
372+ " https://gdc.cancer.gov/system/ files/public/file/gdc-client_2.3_OSX_x64-py3.8-macos-14 .zip"
373373 )
374374 }
375375 )
376376 bin <- links [grep(" public.*zip" , links )]
377377 if (is.windows()) bin <- bin [grep(" client*.*windows" , bin , ignore.case = TRUE )]
378- if (is.mac()) bin <- bin [grep(" client*.*OSX" , bin )]
378+ if (is.mac()) {
379+ if (Sys.info()[" machine" ] == " arm64" ){
380+ bin <- bin [grep(" client*.*OSX.*14" , bin )]
381+ } else {
382+ bin <- bin [grep(" client*.*OSX.*12" , bin )]
383+ }
384+ }
379385 if (is.linux()) {
380386 if (grepl(" ubuntu" , Sys.info()[" version" ], ignore.case = TRUE )) {
381387 bin <- bin [grep(" client*.*Ubuntu" , bin )]
@@ -386,6 +392,9 @@ GDCclientInstall <- function() {
386392 if (is.windows()) mode <- " wb" else mode <- " w"
387393 download(bin , basename(bin ), mode = mode )
388394 unzip(basename(bin ))
395+ if (is.mac()){
396+ unzip(gsub(" -py3.8-macos-14|-py3.8-macos-12" ," " ,basename(bin )))
397+ }
389398 Sys.chmod(" gdc-client" )
390399 return (GDCclientPath())
391400}
0 commit comments