Move more scripts out of tmux folder, move tmux.conf out of conf folder.

(cherry picked from commit 2e54188)
This commit is contained in:
Darko
2015-09-30 11:35:59 +02:00
parent 7ae57f416d
commit 05056ba84b
8 changed files with 15 additions and 90 deletions
+4 -4
View File
@@ -153,9 +153,9 @@ function window_proxy($tmux_session, $window)
$nntpproxy = $pdo->getSetting('nntpproxy');
if ($nntpproxy === '1') {
$DIR = NN_MISC;
$nntpproxypy = $DIR . "update_scripts/nix_scripts/tmux/python/nntpproxy.py";
if (file_exists($DIR . "update_scripts/nix_scripts/tmux/python/lib/nntpproxy.conf")) {
$nntpproxyconf = $DIR . "update_scripts/nix_scripts/tmux/python/lib/nntpproxy.conf";
$nntpproxypy = $DIR . "update_scripts/python/nntpproxy.py";
if (file_exists($DIR . "update_scripts/python/lib/nntpproxy.conf")) {
$nntpproxyconf = $DIR . "update_scripts/python/lib/nntpproxy.conf";
exec("tmux new-window -t $tmux_session -n nntpproxy 'printf \"\033]2;NNTPProxy\033\" && python $nntpproxypy $nntpproxyconf'");
}
}
@@ -235,7 +235,7 @@ function attach($DIR, $tmux_session)
if ($powerline == 1) {
$tmuxconfig = $DIR . "powerline/tmux.conf";
} else {
$tmuxconfig = $DIR . "conf/tmux.conf";
$tmuxconfig = $DIR . "tmux.conf";
}
if ($seq == 1) {