f028e10 · nix-bundle · git.iko.soy

git.iko.soy/nix-bundle

on master help sign in

Merge pull request #51 from tomberek/preserve_pwd

f028e10Matthew Bauer7 years ago

AppRun.c+4−1

@@ -226,8 +226,10 @@ int main(int argc, char *argv[]) {

226 err_exit("chroot(%s)", rootdir);

227 }

228

229+ char *pwddir = getenv("PWD");

229− chdir("/");

230+ chdir(pwddir);

230

231

232+ SAVE_ENV_VAR(PWD);

231 SAVE_ENV_VAR(DBUS_SESSION_BUS_ADDRESS);

233 SAVE_ENV_VAR(DBUS_SESSION_BUS_ADDRESS);

232 SAVE_ENV_VAR(USER);

234 SAVE_ENV_VAR(USER);

233 SAVE_ENV_VAR(HOSTNAME);

235 SAVE_ENV_VAR(HOSTNAME);

@@ -243,6 +245,7 @@ int main(int argc, char *argv[]) {

243

245

244 clearenv();

246 clearenv();

245

247

248+ LOAD_ENV_VAR(PWD);

246 LOAD_ENV_VAR(DBUS_SESSION_BUS_ADDRESS);

249 LOAD_ENV_VAR(DBUS_SESSION_BUS_ADDRESS);

247 LOAD_ENV_VAR(USER);

250 LOAD_ENV_VAR(USER);

248 LOAD_ENV_VAR(HOSTNAME);

251 LOAD_ENV_VAR(HOSTNAME);