fixup: version

Author: Hans Larsen

dfx/src/config/cache.rs

@@ -1,6 +1,7 @@
 use std::io::{Error, ErrorKind, Result};
 use std::path::PathBuf;
 
+use crate::config::dfx_version;
 use crate::util;
 
 pub fn get_bin_cache_root() -> Result<PathBuf> {
@@ -31,14 +32,7 @@ pub fn get_bin_cache_root() -> Result<PathBuf> {
 
 pub fn get_bin_cache(v: &str) -> Result<PathBuf> {
     let root = get_bin_cache_root()?;
-
-    match v {
-        "0.2.0" => Ok(root.join("0.2.0")),
-        v => Err(Error::new(
-            ErrorKind::Other,
-            format!("Unknown version: {}", v),
-        )),
-    }
+    Ok(root.join(v))
 }
 
 pub fn is_version_installed(v: &str) -> Result<bool> {
@@ -60,15 +54,14 @@ pub fn install_version(v: &str) -> Result<PathBuf> {
         return Ok(p);
     }
 
-    match v {
-        "0.2.0" => {
-            util::assets::binary_cache()?.unpack(p.as_path())?;
-            Ok(p)
-        }
-        v => Err(Error::new(
+    if v == dfx_version() {
+        util::assets::binary_cache()?.unpack(p.as_path())?;
+        Ok(p)
+    } else {
+        Err(Error::new(
             ErrorKind::Other,
             format!("Unknown version: {}", v),
-        )),
+        ))
     }
 }
 

dfx/src/config/mod.rs

@@ -1,4 +1,28 @@
 pub mod cache;
 pub mod dfinity;
 
-pub const DFX_VERSION: &str = env!("CARGO_PKG_VERSION");
+static mut DFX_VERSION: Option<String> = None;
+pub fn dfx_version() -> &'static str {
+    unsafe {
+        match &DFX_VERSION {
+            Some(x) => x.as_str(),
+            None => {
+                let version = env!("CARGO_PKG_VERSION");
+
+                #[cfg(debug_assertions)]
+                {
+                    // In debug, add a timestamp of the compilation at the end of version to ensure all
+                    // debug runs are unique (and cached uniquely).
+                    DFX_VERSION = Some(format!(
+                        "{}-{}",
+                        version,
+                        std::env::var("DFX_TIMESTAMP_DEBUG_MODE_ONLY")
+                            .unwrap_or_else(|_| "local-debug".to_owned())
+                    ));
+                }
+
+                dfx_version()
+            }
+        }
+    }
+}

dfx/src/lib/env.rs

@@ -1,5 +1,5 @@
 use crate::config::dfinity::Config;
-use crate::config::{cache, DFX_VERSION};
+use crate::config::{cache, dfx_version};
 use crate::lib::api_client::{Client, ClientConfig};
 use crate::lib::error::DfxResult;
 use std::cell::RefCell;
@@ -116,7 +116,7 @@ impl InProjectEnvironment {
             version: config
                 .get_config()
                 .get_dfx()
-                .unwrap_or_else(|| DFX_VERSION.to_owned()),
+                .unwrap_or_else(|| dfx_version().to_owned()),
             config,
             client: RefCell::new(None),
         })
@@ -174,25 +174,8 @@ impl VersionEnv for GlobalEnvironment {
 
 impl GlobalEnvironment {
     pub fn from_current_dir() -> DfxResult<GlobalEnvironment> {
-        #[cfg(debug_assertions)]
-        {
-            // In debug, add a timestamp of the compilation at the end of version to ensure all
-            // debug runs are unique (and cached uniquely).
-            Ok(GlobalEnvironment {
-                version: format!(
-                    "{}-{:?}",
-                    DFX_VERSION.to_owned(),
-                    std::env::var_os("DFX_TIMESTAMP_DEBUG_MODE_ONLY")
-                        .unwrap_or_else(|| std::ffi::OsString::from("local-debug"))
-                ),
-            })
-        }
-
-        #[cfg(not(debug_assertions))]
-        {
-            Ok(GlobalEnvironment {
-                version: DFX_VERSION.to_owned(),
-            })
-        }
+        Ok(GlobalEnvironment {
+            version: dfx_version().to_owned(),
+        })
     }
 }