1
0
mirror of https://github.com/QSCTech/zjunet.git synced 2026-01-22 19:54:48 +08:00

Fix several bugs

This commit is contained in:
Wu Yufei 2019-08-12 17:58:43 +08:00
parent 6e3ee5d8bb
commit c3f67f4692
No known key found for this signature in database
GPG Key ID: 226E1C0EDF292D66
3 changed files with 19 additions and 8 deletions

View File

@ -13,7 +13,7 @@ echo "Group: Applications/Internet" >> zjunet.spec
echo "URL: https://github.com/QSCTech/zjunet/" >> zjunet.spec echo "URL: https://github.com/QSCTech/zjunet/" >> zjunet.spec
echo "Vendor: Qiu Shi Chao Website of Zhejiang University" >> zjunet.spec echo "Vendor: Qiu Shi Chao Website of Zhejiang University" >> zjunet.spec
echo "Packager: Senorsen <sen@senorsen.com>" >> zjunet.spec echo "Packager: Senorsen <sen@senorsen.com>" >> 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 "BuildRoot: %{_builddir}/%{name}-root" >> zjunet.spec
echo "Source: %{name}-%{version}.tar.gz" >> zjunet.spec echo "Source: %{name}-%{version}.tar.gz" >> zjunet.spec
echo "BuildArch: noarch" >> zjunet.spec echo "BuildArch: noarch" >> zjunet.spec

View File

@ -1,12 +1,23 @@
#!/bin/sh #!/bin/sh
set -e
BASEDIR=$(dirname $0)/lib BASEDIR=$(dirname $0)/lib
mkdir -p /usr/local/lib/zjunet if [ -z "$PREFIX" ]; then
cp -rf $BASEDIR/* /usr/local/lib/zjunet PREFIX=/usr/local
mkdir -p /usr/local/bin fi
echo "#!/bin/sh" > /usr/local/bin/zjunet
echo '/usr/local/lib/zjunet/zjunet.sh "$@"' >> /usr/local/bin/zjunet mkdir -p $PREFIX/lib/zjunet
chmod +x /usr/local/bin/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 "[INFO] Done."
echo echo
zjunet usage zjunet usage

View File

@ -19,7 +19,7 @@
# <http://www.gnu.org/licenses/>. # <http://www.gnu.org/licenses/>.
BASEDIR=$(dirname $0) BASEDIR=$(dirname $0)
MISCELLDIR="/usr/share/zjunet" MISCELLDIR="$BASEDIR/../../share/zjunet"
case "$1" in case "$1" in
route) route)