diff --git a/VERSION b/VERSION new file mode 100644 index 0000000..964ad36 --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +0.2.5-1 diff --git a/build/build.sh b/build/build.sh index e4d8e61..a370dc1 100755 --- a/build/build.sh +++ b/build/build.sh @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=$(cat ../lib/version) +VERSION=$(cat ../VERSION) cd rpm ./build.sh $VERSION diff --git a/build/debian/build.sh b/build/debian/build.sh index 79948eb..ca746f7 100755 --- a/build/debian/build.sh +++ b/build/debian/build.sh @@ -7,10 +7,11 @@ VERSION=$1 # share mkdir -p ./debian/usr/share/zjunet cp ../../miscellaneous/* ./debian/usr/share/zjunet +cp ../../VERSION ./debian/usr/share/zjunet # lib mkdir -p ./debian/usr/lib/zjunet -cp ../../lib/* ./debian/usr/lib/zjunet +cp ../../lib/*.sh ./debian/usr/lib/zjunet # bin mkdir -p ./debian/usr/bin diff --git a/build/openwrt/build.sh b/build/openwrt/build.sh index 0020d1c..e4732f2 100755 --- a/build/openwrt/build.sh +++ b/build/openwrt/build.sh @@ -4,9 +4,14 @@ rm -rf *.opk VERSION=$1 +# share +mkdir -p ./debian/usr/share/zjunet +cp ../../miscellaneous/* ./debian/usr/share/zjunet +cp ../../VERSION ./debian/usr/share/zjunet + # lib mkdir -p ./debian/usr/lib/zjunet -cp ../../lib/* ./debian/usr/lib/zjunet +cp ../../lib/*.sh ./debian/usr/lib/zjunet # bin mkdir -p ./debian/usr/bin diff --git a/build/rpm/build.sh b/build/rpm/build.sh index 0f4d8ae..c5acf2b 100755 --- a/build/rpm/build.sh +++ b/build/rpm/build.sh @@ -10,6 +10,7 @@ mkdir -p rpm/ # share cp ../../miscellaneous/* rpm/ +cp ../../VERSION rpm/ # lib mkdir -p rpm/lib/ diff --git a/build/rpm/build_spec.sh b/build/rpm/build_spec.sh index 619d41d..fc8a0ed 100755 --- a/build/rpm/build_spec.sh +++ b/build/rpm/build_spec.sh @@ -40,7 +40,7 @@ for f in *.sh; do echo "install -m 755 lib/$f \$RPM_BUILD_ROOT/usr/lib/zjunet/$f" >> ../zjunet.spec done cd .. -echo 'install -m 644 lib/version $RPM_BUILD_ROOT/usr/lib/zjunet/version' >> zjunet.spec +echo 'install -m 644 VERSION $RPM_BUILD_ROOT/usr/share/zjunet/VERSION' >> zjunet.spec echo 'install -m 644 qsc.public.key $RPM_BUILD_ROOT/usr/share/zjunet/qsc.public.key' >> zjunet.spec echo 'install -m 644 qsc.repo $RPM_BUILD_ROOT/usr/share/zjunet/qsc.repo' >> zjunet.spec echo "" >> zjunet.spec @@ -50,8 +50,9 @@ echo "/usr/bin/zjunet" >> zjunet.spec echo "/usr/share/zjunet/qsc.public.key" >> zjunet.spec echo "/usr/share/zjunet/qsc.repo" >> zjunet.spec echo "/usr/share/zjunet/zjunet-postinst" >> zjunet.spec +echo "/usr/share/zjunet/VERSION" >> zjunet.spec cd lib -for f in *; do +for f in *.sh; do echo "/usr/lib/zjunet/$f" >> ../zjunet.spec done cd .. diff --git a/lib/VERSION b/lib/VERSION new file mode 120000 index 0000000..6ff19de --- /dev/null +++ b/lib/VERSION @@ -0,0 +1 @@ +../VERSION \ No newline at end of file diff --git a/lib/version b/lib/version deleted file mode 100644 index a046040..0000000 --- a/lib/version +++ /dev/null @@ -1 +0,0 @@ -0.2.4-6 diff --git a/lib/zjunet.sh b/lib/zjunet.sh index f5b0487..27486c7 100755 --- a/lib/zjunet.sh +++ b/lib/zjunet.sh @@ -40,13 +40,14 @@ case "$1" in dns) "${BASEDIR}/dns.sh" ;; - --version) - version=$(cat "${BASEDIR}/version" | sed 's/-.*//') - echo "zjunet version: zjunet-$version" + version|--version) + version_full=`cat "${BASEDIR}/VERSION"` + version=$(echo $version_full | sed 's/-.*//') + echo "zjunet version: $version (${version_full})" ;; *) cat <