From: Sergey Matveev <stargrave@stargrave.org>
Date: Fri, 21 Jun 2024 16:38:30 +0000 (+0300)
Subject: Proper paths
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=5c13732efa877680dd666f172a8896b86e63b9fe;p=dotfiles.git

Proper paths
---

diff --git a/x/bin/dwm-menu b/x/bin/dwm-menu
index 5f650a1..98c04ff 100755
--- a/x/bin/dwm-menu
+++ b/x/bin/dwm-menu
@@ -4,7 +4,7 @@ DMENU=/home/stargrave/src/suckless/dmenu/dmenu
 STEST=/home/stargrave/src/suckless/dmenu/stest
 
 cache=/tmp/.dmenu_cache
-export PATH=$HOME/bin:$HOME/local/bin:/usr/local/bin:/usr/bin:/bin:/usr/games:
+export PATH=$HOME/env/local/bin:$HOME/bin:$HOME/local/bin:/usr/local/bin:/usr/bin:/bin:/usr/games:
 (
 	IFS=:
 	if $STEST -dqr -n "$cache" $PATH; then
diff --git a/x/bin/dwm-term-session b/x/bin/dwm-term-session
index 37865c7..e0fd53d 100755
--- a/x/bin/dwm-term-session
+++ b/x/bin/dwm-term-session
@@ -1,3 +1,3 @@
-#!/usr/bin/env zsh
+#!/bin/sh -e
 
 CMD="tmux attach-session -t $@" $HOME/bin/dwm-term &
diff --git a/x/bin/start-im b/x/bin/start-im
index 48d86d1..af2d919 100755
--- a/x/bin/start-im
+++ b/x/bin/start-im
@@ -1,3 +1,3 @@
-#!/usr/bin/env zsh
+#!/bin/sh -e
 
 st -t Terminal8 -e sh -c "cd /home/stargrave/secure/mmc ; envdir env /home/stargrave/work/mmc/cmd/start" 2>/dev/null &
diff --git a/zsh/.zsh/env/005paths.zsh b/zsh/.zsh/env/005paths.zsh
index 4ad8fdd..dfd25ae 100644
--- a/zsh/.zsh/env/005paths.zsh
+++ b/zsh/.zsh/env/005paths.zsh
@@ -1,6 +1,5 @@
-path=(~/bin ~/local/bin /usr/local/bin /usr/local/sbin /usr/bin /usr/sbin /bin /sbin)
+path=(~/local/bin ~/bin /usr/local/bin /usr/local/sbin /usr/bin /usr/sbin /bin /sbin)
 manpath=(
-    ~/local/share/man
     /usr/local/lib/perl5/5.26/perl/man
     /usr/local/lib/perl5/site_perl/man
     /usr/share/openssl/man
@@ -9,10 +8,10 @@ manpath=(
     /usr/share/man
 )
 export -TU INFOPATH infopath
-infopath=(~/local/share/info /usr/local/share/info /usr/local/info)
+infopath=(/usr/local/share/info /usr/local/info)
 
 export -TU PKG_CONFIG_PATH pkg_config_path
-pkg_config_path=(~/local/lib/pkgconfig ~/local/libdata/pkgconfig)
+pkg_config_path=(/usr/local/libdata/pkgconfig /usr/libdata/pkgconfig)
 
 export -TU LD_LIBRARY_PATH ld_library_path
-ld_library_path=(~/local/lib)
+ld_library_path=()
diff --git a/zsh/.zsh/env/010c.zsh b/zsh/.zsh/env/010c.zsh
index c6dd0e9..2b94940 100644
--- a/zsh/.zsh/env/010c.zsh
+++ b/zsh/.zsh/env/010c.zsh
@@ -1,8 +1,8 @@
 export -TU CFLAGS cflags " "
-cflags=(-I$HOME/local/include -I/usr/local/include -I/usr/local/include/PCSC)
+cflags=(-I/usr/local/include -I/usr/local/include/PCSC)
 
 export -TU LDFLAGS ldflags " "
-ldflags=(-L$HOME/local/lib -L/usr/local/lib)
+ldflags=(-L/usr/local/lib)
 
 export -TU CXXFLAGS cxxflags " "
 cxxflags=($cflags)