diff --git a/src/dfx/assets/dfinity-color-xterm256.aart b/src/dfx/assets/dfinity-color-xterm256.aart deleted file mode 100644 index 0637491adb..0000000000 --- a/src/dfx/assets/dfinity-color-xterm256.aart +++ /dev/null @@ -1,16 +0,0 @@ -                                                              -                                                              -                                                              -                                                              -                                                              -                                                              -                                                              -                                                              -                                                              -                                                              -                                                              -                                                              -                                                              -                                                              -                                                              -  diff --git a/src/dfx/assets/dfinity-color.aart b/src/dfx/assets/dfinity-color.aart deleted file mode 100644 index daae6d7392..0000000000 --- a/src/dfx/assets/dfinity-color.aart +++ /dev/null @@ -1,16 +0,0 @@ -        ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄                ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄        -      ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄          ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄     -    ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄      ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄   -   ▄▄▄▄▄▄▄▄▄▄▀▀▀▀▀▄▄▄▄▄▄▄▄▄▄▄▄  ▄▄▄▄▄▄▄▄▄▄▄▄▀▀▀▀▀▀▄▄▄▄▄▄▄▄▄▄  -  ▄▄▄▄▄▄▄▄▀         ▀▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▀         ▀▄▄▄▄▄▄▄▄▄ - ▄▄▄▄▄▄▄▄▀            ▀▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▀             ▄▄▄▄▄▄▄▄ - ▄▄▄▄▄▄▄▄               ▀▄▄▄▄▄▄▄▄▄▄▄▄▀                ▄▄▄▄▄▄▄ - ▄▄▄▄▄▄▄▄                ▄▄▄▄▄▄▄▄▄▄▄▄                 ▄▄▄▄▄▄▄ - ▄▄▄▄▄▄▄▄               ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄              ▄▄▄▄▄▄▄▄ -  ▄▄▄▄▄▄▄▄           ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄          ▄▄▄▄▄▄▄▄▀ -  ▀▄▄▄▄▄▄▄▄▄▄     ▄▄▄▄▄▄▄▄▄▄▄▄▀ ▀▄▄▄▄▄▄▄▄▄▄▄▄    ▄▄▄▄▄▄▄▄▄▄▄  -   ▀▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▀     ▀▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▀   -     ▀▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▀         ▀▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄     -       ▀▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▀▀             ▀▀▄▄▄▄▄▄▄▄▄▄▄▄▄▄▀       -          ▀▀▀▀▀▀▀▀▀▀▀                    ▀▀▀▀▀▀▀▀▀▀▀          -  diff --git a/src/dfx/assets/dfinity-nocolor.aart b/src/dfx/assets/dfinity-nocolor.aart deleted file mode 100644 index e57da0e4dc..0000000000 --- a/src/dfx/assets/dfinity-nocolor.aart +++ /dev/null @@ -1,20 +0,0 @@ - - 8HG5yoXWQ Q#DXZG$b%Q - Rf^_.--..----.'=fR 0ol!~~~~~~~~~:~>fb - Qz:---------..------._)W R{;~~~~~~~~~~~:,____'_]% - Q)'._~!++=+;!!~_--------..~y X^~~~~~~~~~~!+;~___'''''.-r& - H,~>)TTv)f6& Q2*_--.-----_}Q Qy;~~~~~~~~*40 go^'..-````y - k=)TTTv)5Q bi'.------'{ y!~~~~~~~^2Q Q/-``` c - Q)]TT))/b Q{_-------_!~~~~~~~>q $- K - ATvv)/iS C_------.'_~~~z Z!,,,_'-------.=b ] ^ - ]*<>>rry Qy!,,,,,,,^<.-------!$ v `% - Qi>rr^^=.-------_vb y' .H - Q]^^=+++;=JZRQ %X]!,,,,,,,,=X R>.-------._*S% Q&Df=` ``~R - q<+;!!!!~~~~~~:,,,,,,,,,:'--.-------------.;G - Wyi+~:,,,,,,~>zqQ bz^_.------._=c$Q - QQ8#8Q Q#WRBQ - diff --git a/src/dfx/assets/welcome.txt b/src/dfx/assets/welcome.txt deleted file mode 100644 index e14d0176d8..0000000000 --- a/src/dfx/assets/welcome.txt +++ /dev/null @@ -1,22 +0,0 @@ - -=============================================================================== - Welcome to the internet computer developer community! - You're using dfx {0} - -{1} - -To learn more before you start coding, see the documentation available online: - -- Quick Start: https://internetcomputer.org/docs/current/tutorials/deploy_sample_app -- SDK Developer Tools: https://internetcomputer.org/docs/current/developer-docs/setup/install/ -- Motoko Language Guide: https://internetcomputer.org/docs/current/motoko/main/about-this-guide -- Motoko Quick Reference: https://internetcomputer.org/docs/current/motoko/main/language-manual -- Rust CDK Guide: https://internetcomputer.org/docs/current/developer-docs/backend/rust/ - -If you want to work on programs right away, try the following commands to get started: - - cd {2} - dfx help - dfx new --help - -=============================================================================== diff --git a/src/dfx/src/commands/new.rs b/src/dfx/src/commands/new.rs index 412d8269f3..08e67b7256 100644 --- a/src/dfx/src/commands/new.rs +++ b/src/dfx/src/commands/new.rs @@ -21,7 +21,7 @@ use dialoguer::{FuzzySelect, MultiSelect}; use fn_error_context::context; use indicatif::HumanBytes; use semver::Version; -use slog::{info, warn, Logger}; +use slog::{info, trace, warn, Logger}; use std::collections::{BTreeMap, HashMap}; use std::io::{self, IsTerminal, Read}; use std::path::{Path, PathBuf}; @@ -130,7 +130,7 @@ pub fn create_file(log: &Logger, path: &Path, content: &[u8], dry_run: bool) -> .with_context(|| format!("Failed to write to {}.", path.to_string_lossy()))?; } - info!(log, "{}", Status::Create(path, content.len())); + trace!(log, "{}", Status::Create(path, content.len())); Ok(()) } @@ -184,7 +184,7 @@ pub fn create_dir>(log: &Logger, path: P, dry_run: bool) -> DfxRe .with_context(|| format!("Failed to create directory {}.", path.to_string_lossy()))?; } - info!(log, "{}", Status::CreateDir(path)); + trace!(log, "{}", Status::CreateDir(path)); Ok(()) } @@ -198,7 +198,7 @@ pub fn init_git(log: &Logger, project_name: &Path) -> DfxResult { .status(); if init_status.is_ok() && init_status.unwrap().success() { - info!(log, "Creating git repository..."); + info!(log, "Initializing git repository..."); std::process::Command::new("git") .arg("add") .current_dir(project_name) @@ -558,12 +558,14 @@ pub fn exec(env: &dyn Environment, mut opts: NewOpts) -> DfxResult { // Print welcome message. info!( log, - // This needs to be included here because we cannot use the result of a function for - // the format!() rule (and so it cannot be moved in the util::assets module). - include_str!("../../assets/welcome.txt"), - version_str, - assets::dfinity_logo(), - project_name_str + "=============================================================================== + Welcome to the internet computer developer community! + +To learn more before you start coding, check out the developer docs and samples: + +- Documentation: https://internetcomputer.org/docs/current/developer-docs +- Samples: https://internetcomputer.org/samples +===============================================================================" ); Ok(()) diff --git a/src/dfx/src/util/assets.rs b/src/dfx/src/util/assets.rs index 87ab80a8ff..aa6d032236 100644 --- a/src/dfx/src/util/assets.rs +++ b/src/dfx/src/util/assets.rs @@ -6,20 +6,6 @@ use std::io::Read; include!(concat!(env!("OUT_DIR"), "/load_assets.rs")); -pub fn dfinity_logo() -> String { - let colors = supports_color::on(supports_color::Stream::Stdout); - if let Some(colors) = colors { - //Some terminals, notably MacOS's Terminal.app, do not support Truecolor (RGB-colored characters) properly. - //Therefore we use xterm256 coloring when the program is running in such a terminal. - if colors.has_16m { - return include_str!("../../assets/dfinity-color.aart").to_string(); - } else if colors.has_256 { - return include_str!("../../assets/dfinity-color-xterm256.aart").to_string(); - } - } - include_str!("../../assets/dfinity-nocolor.aart").to_string() -} - #[context("Failed to load wallet wasm.")] pub fn wallet_wasm(logger: &slog::Logger) -> DfxResult> { if let Ok(dfx_wallet_wasm) = std::env::var("DFX_WALLET_WASM") {