@@ -19,27 +19,26 @@ export interface Config {
1919 git ?: Path
2020}
2121
22- function platform_cache_default ( home : Path ) {
22+ function platform_cache_default ( home : Path , { LOCALAPPDATA } : { LOCALAPPDATA ?: string } ) {
2323 switch ( Deno . build . os ) {
2424 case 'darwin' :
2525 return home . join ( 'Library/Caches' )
2626 case 'windows' :
27- return flatmap ( Deno . env . get ( " LOCALAPPDATA" ) , Path . abs ) ?? home . join ( 'AppData/Local' )
27+ return flatmap ( LOCALAPPDATA , Path . abs ) ?? home . join ( 'AppData/Local' )
2828 default :
2929 return home . join ( '.cache' )
3030 }
3131}
3232
33- function platform_data_home_default ( home : Path ) {
33+ function platform_data_home_default ( home : Path , { LOCALAPPDATA } : { LOCALAPPDATA ?: string } ) {
3434 switch ( host ( ) . platform ) {
3535 case 'darwin' :
3636 return home . join ( "Library/Application Support" )
3737 case 'windows' : {
38- const LOCALAPPDATA = Deno . env . get ( 'LOCALAPPDATA' )
3938 if ( LOCALAPPDATA ) {
40- return new Path ( LOCALAPPDATA ) . join ( "pkgx" )
39+ return new Path ( LOCALAPPDATA )
4140 } else {
42- return home . join ( "AppData/Local/pkgx " )
41+ return home . join ( "AppData/Local" )
4342 } }
4443 default :
4544 return home . join ( ".local/share" )
@@ -52,8 +51,8 @@ export function ConfigDefault(env = Deno.env.toObject()): Config {
5251 const home = flatmap ( env [ 'PKGX_HOME' ] , x => new Path ( x ) ) ?? Path . home ( )
5352 const prefix = flatmap ( env [ 'PKGX_DIR' ] ?. trim ( ) , x => new Path ( x ) ) ?? home . join ( '.pkgx' )
5453 const pantries = env [ 'PKGX_PANTRY_PATH' ] ?. split ( SEP ) . compact ( x => flatmap ( x . trim ( ) , x => Path . abs ( x ) ?? Path . cwd ( ) . join ( x ) ) ) ?? [ ]
55- const cache = ( flatmap ( env [ "XDG_CACHE_HOME" ] , Path . abs ) ?? platform_cache_default ( home ) ) . join ( "pkgx" )
56- const data = ( flatmap ( env [ "XDG_DATA_HOME" ] , Path . abs ) ?? platform_data_home_default ( home ) ) . join ( "pkgx" )
54+ const cache = ( flatmap ( env [ "XDG_CACHE_HOME" ] , Path . abs ) ?? platform_cache_default ( home , env ) ) . join ( "pkgx" )
55+ const data = ( flatmap ( env [ "XDG_DATA_HOME" ] , Path . abs ) ?? platform_data_home_default ( home , env ) ) . join ( "pkgx" )
5756 const isCI = boolize ( env [ 'CI' ] ) ?? false
5857 const UserAgent = flatmap ( getv ( ) , v => `libpkgx/${ v } ` ) ?? 'libpkgx'
5958 //TODO prefer 'xz' on Linux (as well) if supported
0 commit comments