gluon-core: fix pattern %v in opkg URLs (#1087)

This commit is contained in:
Julian 2017-04-07 14:24:13 +02:00 committed by Matthias Schiffer
parent 6a0ca58fc3
commit 13c61d9394

View File

@ -8,13 +8,13 @@ local util = require 'gluon.util'
local subst = {} local subst = {}
local f = io.popen('. /etc/openwrt_release; echo "$DISTRIB_CODENAME"; echo "$DISTRIB_TARGET"; echo "$DISTRIB_ARCH"') local f = io.popen('. /etc/openwrt_release; echo "$DISTRIB_CODENAME"; echo "$DISTRIB_RELEASE"; echo "$DISTRIB_TARGET"; echo "$DISTRIB_ARCH"')
subst['%%n'] = f:read() subst['%%n'] = f:read()
subst['%%v'] = f:read():gsub('-SNAPSHOT', '')
subst['%%S'] = f:read() subst['%%S'] = f:read()
subst['%%A'] = f:read() subst['%%A'] = f:read()
f:close() f:close()
subst['%%v'] = util.trim(fs.readfile('/etc/openwrt_version'))
subst['%%GS'] = site.site_code subst['%%GS'] = site.site_code
subst['%%GV'] = util.trim(fs.readfile('/lib/gluon/gluon-version')) subst['%%GV'] = util.trim(fs.readfile('/lib/gluon/gluon-version'))
subst['%%GR'] = util.trim(fs.readfile('/lib/gluon/release')) subst['%%GR'] = util.trim(fs.readfile('/lib/gluon/release'))