Skip to content

Commit da0e272

Browse files
committed
修正sslib引用方式,使程序可在任意路径运行
1 parent 51d6ce3 commit da0e272

File tree

3 files changed

+18
-9
lines changed

3 files changed

+18
-9
lines changed

ssadmin.sh

+9-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,15 @@
2020
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2121
# SOFTWARE.
2222

23-
. sslib.sh
23+
SOURCE="${BASH_SOURCE[0]}"
24+
while [ -h "$SOURCE" ]; do
25+
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
26+
SOURCE="$(readlink "$SOURCE")"
27+
[[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE"
28+
done
29+
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
30+
31+
. $DIR/sslib.sh
2432

2533
usage () {
2634
cat $DIR/sshelp

sscounter.sh

+9-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,15 @@
2020
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2121
# SOFTWARE.
2222

23-
. sslib.sh
23+
SOURCE="${BASH_SOURCE[0]}"
24+
while [ -h "$SOURCE" ]; do
25+
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
26+
SOURCE="$(readlink "$SOURCE")"
27+
[[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE"
28+
done
29+
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
30+
31+
. $DIR/sslib.sh
2432

2533
update_or_create_traffic_file_from_users
2634
init_ipt_chains

sslib.sh

-7
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,6 @@ SSSERVER=ssserver
2525

2626
SSSERVER_NAME=`basename $SSSERVER`
2727

28-
SOURCE="${BASH_SOURCE[0]}"
29-
while [ -h "$SOURCE" ]; do
30-
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
31-
SOURCE="$(readlink "$SOURCE")"
32-
[[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE"
33-
done
34-
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
3528
TMPDIR=$DIR/tmp
3629
if [ ! -e $TMPDIR ]; then
3730
mkdir $TMPDIR;

0 commit comments

Comments
 (0)