diff --git a/.travis.yml b/.travis.yml index 873ebd13..f271349e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,7 +43,7 @@ script: - cd $P_DIR/service && CGO_ENABLED=0 gox -ldflags '-extldflags "-static"' -osarch="linux/386 linux/amd64 linux/arm linux/arm64" -ldflags="-X github.com/v2rayA/v2rayA/global.Version=${VERSION:1} -s -w" -output="$P_DIR/v2raya_{{.OS}}_{{.Arch}}_$VERSION" - mv $P_DIR/v2raya_linux_386_$VERSION $P_DIR/v2raya_linux_x86_$VERSION && mv $P_DIR/v2raya_linux_amd64_$VERSION $P_DIR/v2raya_linux_x64_$VERSION - files="install/universal/v2raya.service=/etc/systemd/system/v2raya.service install/universal/v2raya@.service=/etc/systemd/system/v2raya@.service install/universal/v2raya.png=/usr/share/icons/hicolor/512x512/apps/v2raya.png install/universal/v2raya.desktop=/usr/share/applications/v2raya.desktop" - - params="--maintainer v2rayA --after-install install/universal/after_install.sh --after-upgrade $P_DIR/install/universal/after_upgrade.sh --before-remove $P_DIR/install/universal/before_remove.sh --after-remove $P_DIR/install/universal/after_remove.sh --verbose -f -n $NAME -v ${VERSION:1} --url https://github.com/v2rayA/v2raya" + - params="--maintainer v2rayA --after-install install/universal/after_install.sh --after-upgrade $P_DIR/install/universal/after_upgrade.sh --verbose -f -n $NAME -v ${VERSION:1} --url https://github.com/v2rayA/v2raya" - cd $P_DIR - tar -zcvf web.tar.gz web/ - fpm -s dir -t deb -p installer_debian_x86_$VERSION.deb --description "$DESC" --architecture=i386 $params v2raya_linux_x86_$VERSION=/usr/bin/v2raya $files diff --git a/install/universal/after_install.sh b/install/universal/after_install.sh index 5b41dc82..cb86078d 100644 --- a/install/universal/after_install.sh +++ b/install/universal/after_install.sh @@ -1,8 +1,6 @@ #!/bin/sh systemctl daemon-reload -systemctl enable v2raya -systemctl start v2raya ECHOLEN=$(echo -e|awk '{print length($0)}') if [ ${ECHOLEN} = '0' ] diff --git a/install/universal/after_remove.sh b/install/universal/after_remove.sh deleted file mode 100644 index 4ea11bdb..00000000 --- a/install/universal/after_remove.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -systemctl daemon-reload diff --git a/install/universal/after_upgrade.sh b/install/universal/after_upgrade.sh index 9892886f..f0fc496c 100644 --- a/install/universal/after_upgrade.sh +++ b/install/universal/after_upgrade.sh @@ -1,7 +1,6 @@ #!/bin/sh systemctl daemon-reload -systemctl restart v2raya ECHOLEN=$(echo -e|awk '{print length($0)}') if [ ${ECHOLEN} = '0' ] diff --git a/install/universal/before_remove.sh b/install/universal/before_remove.sh deleted file mode 100644 index 698e4327..00000000 --- a/install/universal/before_remove.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -systemctl disable v2raya || true -systemctl stop v2raya || true