Skip to content

Commit

Permalink
Path/version: Replace hardcoded path bin/ with BINARY_SUFFIX or `…
Browse files Browse the repository at this point in the history
…bin${BBSVER}/`
  • Loading branch information
IepIweidieng committed Oct 5, 2020
1 parent 27e28e4 commit 6ee5d2d
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions maple/mail.c
Original file line number Diff line number Diff line change
Expand Up @@ -1021,15 +1021,15 @@ do_forward(
gem_fpath(fpath, currboard, NULL);
}

// sprintf(cmd, "tar -zcv -f - %s | bin/base64encode > tmp/%s.tgz", fpath, userid);
// sprintf(cmd, "tar -zcv -f - %s | " BINARY_SUFFIX "base64encode > tmp/%s.tgz", fpath, userid);
// r2.20180316: try system default util to excute base64 encoding
#ifdef __linux__
sprintf(cmd, "tar -zcf - %s | base64 > tmp/%s.tgz", fpath, userid);
#else
#ifdef __FreeBSD__
sprintf(cmd, "tar -zcf - %s | b64encode -r %s > tmp/%s.tgz", fpath, userid, userid);
#else
sprintf(cmd, "tar -zcf - %s | bin/base64encode > tmp/%s.tgz", fpath, userid);
sprintf(cmd, "tar -zcf - %s | " BINARY_SUFFIX "base64encode > tmp/%s.tgz", fpath, userid);
#endif
#endif /* #ifdef __linux__ */

Expand Down Expand Up @@ -1304,7 +1304,7 @@ m_setmboxdir(void)

sprintf(fpath1, BBSHOME "/usr/%s/%s", id, cuser.userid);

sprintf(fpath2, BBSHOME "/bin/redir");
sprintf(fpath2, BBSHOME "/" BINARY_SUFFIX "redir");

sprintf(fpath3, "mv .DIR.@ .DIR");

Expand Down
6 changes: 3 additions & 3 deletions scripts/start.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
"$HOME/bin/camera"
"$HOME/bin/acpro"
"$HOME/bin/makefw"
"$BBSHOME/bin$BBSVER/camera"
"$BBSHOME/bin$BBSVER/acpro"
"$BBSHOME/bin$BBSVER/makefw"
2 changes: 1 addition & 1 deletion scripts/top.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh
# ±Æ¦æº]µ{¦¡°õ¦æ
if [ "${BBSHOME}" = "" ]; then BBSHOME="/home/bbs"; fi
"${BBSHOME}/bin/topusr" > "${BBSHOME}/gem/@/@pop.new"
"${BBSHOME}/bin${BBSVER}/topusr" > "${BBSHOME}/gem/@/@pop.new"
mv "${BBSHOME}/gem/@/@pop.new" "${BBSHOME}/gem/@/@pop"

0 comments on commit 6ee5d2d

Please sign in to comment.