diff --git a/build/rpm/build_spec.sh b/build/rpm/build_spec.sh index 0633fc7..c50c0b1 100755 --- a/build/rpm/build_spec.sh +++ b/build/rpm/build_spec.sh @@ -13,7 +13,7 @@ echo "Group: Applications/Internet" >> zjunet.spec echo "URL: https://github.com/QSCTech/zjunet/" >> zjunet.spec echo "Vendor: Qiu Shi Chao Website of Zhejiang University" >> zjunet.spec echo "Packager: Senorsen " >> zjunet.spec -echo "Requires: xl2tpd >= 1.3.1, curl, dnsutils" >> zjunet.spec +echo "Requires: xl2tpd >= 1.3.1, curl, bind-tools" >> zjunet.spec echo "BuildRoot: %{_builddir}/%{name}-root" >> zjunet.spec echo "Source: %{name}-%{version}.tar.gz" >> zjunet.spec echo "BuildArch: noarch" >> zjunet.spec diff --git a/install.sh b/install.sh index 9911f4d..b5bad2d 100755 --- a/install.sh +++ b/install.sh @@ -1,12 +1,23 @@ #!/bin/sh +set -e + BASEDIR=$(dirname $0)/lib -mkdir -p /usr/local/lib/zjunet -cp -rf $BASEDIR/* /usr/local/lib/zjunet -mkdir -p /usr/local/bin -echo "#!/bin/sh" > /usr/local/bin/zjunet -echo '/usr/local/lib/zjunet/zjunet.sh "$@"' >> /usr/local/bin/zjunet -chmod +x /usr/local/bin/zjunet +if [ -z "$PREFIX" ]; then + PREFIX=/usr/local +fi + +mkdir -p $PREFIX/lib/zjunet +cp -rf $BASEDIR/* $PREFIX/lib/zjunet +mkdir -p $PREFIX/bin +mkdir -p $PREFIX/share/zjunet +ln -fs ../../share/zjunet/VERSION $PREFIX/lib/zjunet/VERSION +cp -f VERSION $PREFIX/share/zjunet +cat > $PREFIX/bin/zjunet << EOF +#!/bin/sh +$PREFIX/lib/zjunet/zjunet.sh "\$@" +EOF +chmod +x $PREFIX/bin/zjunet echo "[INFO] Done." echo zjunet usage diff --git a/lib/zjunet.sh b/lib/zjunet.sh index 0e6493f..41d619d 100755 --- a/lib/zjunet.sh +++ b/lib/zjunet.sh @@ -19,7 +19,7 @@ # . BASEDIR=$(dirname $0) -MISCELLDIR="/usr/share/zjunet" +MISCELLDIR="$BASEDIR/../../share/zjunet" case "$1" in route)