diff --git a/lib/util.sh b/lib/util.sh index 13cbf2d..aff64cc 100644 --- a/lib/util.sh +++ b/lib/util.sh @@ -304,27 +304,8 @@ prepare_dir(){ } version_gen(){ - local y=$(date +%Y) m=$(date +%m) - local release_versions=($y.03 $y.06 $y.09 $y.12) - - for ver in ${release_versions[@]};do - case $m in - 01) dist_release=${y:2}.12.1 ;; - 02) dist_release=${y:2}.12.2 ;; - 03|06|09|12) dist_release=${y:2}.${ver#.*} ;; - 04) dist_release=${y:2}.03.1 ;; - 05) dist_release=${y:2}.03.2 ;; - 07) dist_release=${y:2}.06.1 ;; - 08) dist_release=${y:2}.06.2 ;; - 10) dist_release=${y:2}.09.1 ;; - 11) dist_release=${y:2}.09.2 ;; - esac - done -} - -version_gen2(){ - local y=$(date +%Y) m=$(date +%m) - dist_release=${y:2}.$m + local y=$(date +%Y) m=$(date +%m) + dist_release=${y:2}.$m } init_common(){ @@ -377,7 +358,7 @@ init_buildiso(){ if [[ -z ${dist_release} ]];then # source /etc/lsb-release # dist_release=${DISTRIB_RELEASE} - version_gen2 + version_gen fi if [[ -z ${dist_codename} ]];then