adrian/schematics
1
0
Fork 0
Code Issues Pull requests Releases Activity

Extract TempSetEnv

Browse source
This commit is contained in:
Adrian Heine 2017-03-01 19:47:33 +01:00
parent 38cf1d6e98
commit 3e4d2a4f16
1 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/command_runner.rs
View file

@ -38,16 +38,31 @@ use std::os::unix::process::CommandExt;
use std::env; use std::env;
use users::get_user_by_name; use users::get_user_by_name;
struct TempSetEnv<'a> { name: &'a str, old_value: Option<String> }
impl<'a> TempSetEnv<'a> {
fn new(name: &'a str, new_value: String) -> TempSetEnv<'a> {
let old_value = env::var(name);
env::set_var(name, new_value);
TempSetEnv { name: name, old_value: old_value.ok() }
}
}
impl<'a> Drop for TempSetEnv<'a> {
fn drop(&mut self) {
match self.old_value {
Some(ref val) => env::set_var(self.name, val),
None => env::remove_var(self.name)
}
}
}
impl<'a, C> CommandRunner for UserCommandRunner<'a, C> where C: 'a + CommandRunner { impl<'a, C> CommandRunner for UserCommandRunner<'a, C> where C: 'a + CommandRunner {
fn run_with_args(&self, program: &str, args: &[&str]) -> IoResult<Output> { fn run_with_args(&self, program: &str, args: &[&str]) -> IoResult<Output> {
let uid = get_user_by_name(self.user_name).unwrap().uid(); let uid = get_user_by_name(self.user_name).unwrap().uid();
let old_home = env::var("HOME"); let set_home = TempSetEnv::new("HOME", format!("/home/{}", self.user_name));
env::set_var("HOME", format!("/home/{}", self.user_name)); let set_dbus = TempSetEnv::new("DBUS_SESSION_BUS_ADDRESS", format!("unix:path=/run/user/{}/bus", uid));
let old_dbus = env::var("DBUS_SESSION_BUS_ADDRESS");
env::set_var("DBUS_SESSION_BUS_ADDRESS", format!("unix:path=/run/user/{}/bus", uid));
let res = Command::new(program).uid(uid).gid(uid).args(args).output(); let res = Command::new(program).uid(uid).gid(uid).args(args).output();
if let Ok(dbus) = old_dbus { env::set_var("DBUS_SESSION_BUS_ADDRESS", dbus); }
if let Ok(home) = old_home { env::set_var("HOME", home); }
res res
} }
} }