mirrors
/
nnn
mirror of https://github.com/jarun/nnn.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Archive handling on OS X using unar+lsar" 

This reverts commit 1e859eb1370bd67cecd06b7bc8c6f885b80554bd.
We will use atool on OS X as well, it can be brewed easily.
This commit is contained in:
Arun Prakash Jana 2017-09-27 22:07:04 +05:30
parent 7c54f073fc
commit 6bfbff9519
No known key found for this signature in database
GPG Key ID: A75979F35C080412
2 changed files with 4 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
nnn.c
View File

@ -252,12 +252,7 @@ static char * const utils[] = {
"/usr/bin/xdg-open", "/usr/bin/xdg-open",
#endif #endif
"nlay", "nlay",
#ifdef __APPLE__
"unar",
"lsar"
#else
"atool" "atool"
#endif
}; };
/* Common message strings */ /* Common message strings */
@ -1634,21 +1629,6 @@ show_mediainfo(char *fpath, char *arg)
static int static int
handle_archive(char *fpath, char *arg, char *dir) handle_archive(char *fpath, char *arg, char *dir)
{ {
#ifdef __APPLE__
if (arg[1] == 'x') {
if (!get_output(g_buf, MAX_CMD_LEN, "which", utils[4], NULL, 0))
return -1;
spawn(utils[4], fpath, NULL, dir, F_NORMAL);
} else {
if (!get_output(g_buf, MAX_CMD_LEN, "which", utils[5], NULL, 0))
return -1;
exitcurses();
get_output(NULL, 0, utils[5], fpath, NULL, 1);
initcurses();
}
#else
if (!get_output(g_buf, MAX_CMD_LEN, "which", utils[4], NULL, 0)) if (!get_output(g_buf, MAX_CMD_LEN, "which", utils[4], NULL, 0))
return -1; return -1;
@ -1659,7 +1639,6 @@ handle_archive(char *fpath, char *arg, char *dir)
get_output(NULL, 0, utils[4], arg, fpath, 1); get_output(NULL, 0, utils[4], arg, fpath, 1);
initcurses(); initcurses();
} }
#endif
return 0; return 0;
} }
@ -2606,14 +2585,8 @@ nochange:
if (r == -1) { if (r == -1) {
if (sel == SEL_MEDIA || sel == SEL_FMEDIA) if (sel == SEL_MEDIA || sel == SEL_FMEDIA)
sprintf(g_buf, "%s missing", utils[cfg.metaviewer]); sprintf(g_buf, "%s missing", utils[cfg.metaviewer]);
else {
#ifdef __APPLE__
if (sel == SEL_LIST)
sprintf(g_buf, "%s missing", utils[5]);
else else
#endif
sprintf(g_buf, "%s missing", utils[4]); sprintf(g_buf, "%s missing", utils[4]);
}
printmsg(g_buf); printmsg(g_buf);
goto nochange; goto nochange;