Merge branch 'imag-unstable' into master

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>

1 files changed, 10 insertions, 5 deletions

diff --git a/bin/core/imag/src/main.rs b/bin/core/imag/src/main.rs
index 41757929..d08f2191 100644
--- a/bin/core/imag/src/main.rs
+++ b/bin/core/imag/src/main.rs
@@ -142,12 +142,17 @@ fn get_commands() -> Result<Vec<String>> {
 
 fn main() -> Result<()> {
     // Initialize the Runtime and build the CLI
-    let appname  = "imag";
+    let appname  = ::std::env::current_exe()?
+        .file_name()
+        .ok_or_else(|| format_err!("Program is not a file. This is a BUG, please file me."))?
+        .to_str()
+        .ok_or_else(|| format_err!("Program name is not UTF8. Whut?"))?
+        .to_string();
     let version  = make_imag_version!();
     let about    = "imag - the PIM suite for the commandline";
     let commands = get_commands()?;
     let helptext = help_text(commands.clone());
-    let mut app  = Runtime::get_default_cli_builder(appname, &version, about)
+    let mut app  = Runtime::get_default_cli_builder(&appname, &version, about)
         .settings(&[AppSettings::AllowExternalSubcommands, AppSettings::ArgRequiredElseHelp])
         .arg(Arg::with_name("version")
              .long("version")
@@ -201,7 +206,7 @@ fn main() -> Result<()> {
             commands
                 .iter()
                 .map(|command| {
-                    match Command::new(format!("imag-{}", command))
+                    match Command::new(format!("{}-{}", appname, command))
                         .stdin(::std::process::Stdio::inherit())
                         .stdout(::std::process::Stdio::piped())
                         .stderr(::std::process::Stdio::inherit())
@@ -242,10 +247,10 @@ fn main() -> Result<()> {
                 let subcommand = String::from(subcommand);
                 let subcommand = aliases.get(&subcommand).cloned().unwrap_or(subcommand);
 
-                debug!("Calling 'imag-{}' with args: {:?}", subcommand, subcommand_args);
+                debug!("Calling '{}-{}' with args: {:?}", appname, subcommand, subcommand_args);
 
                 // Create a Command, and pass it the gathered arguments
-                match Command::new(format!("imag-{}", subcommand))
+                match Command::new(format!("{}-{}", appname, subcommand))
                     .stdin(Stdio::inherit())
                     .stdout(Stdio::inherit())
                     .stderr(Stdio::inherit())