From 13c61d9394b031d56f5008a349571e5eb8e7fa48 Mon Sep 17 00:00:00 2001
From: Julian <belzebub40k@users.noreply.github.com>
Date: Fri, 7 Apr 2017 14:24:13 +0200
Subject: [PATCH] gluon-core: fix pattern %v in opkg URLs (#1087)
---
package/gluon-core/luasrc/lib/gluon/upgrade/500-opkg | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/gluon-core/luasrc/lib/gluon/upgrade/500-opkg b/package/gluon-core/luasrc/lib/gluon/upgrade/500-opkg
index 4b17471d2..527427988 100755
--- a/package/gluon-core/luasrc/lib/gluon/upgrade/500-opkg
+++ b/package/gluon-core/luasrc/lib/gluon/upgrade/500-opkg
@@ -8,13 +8,13 @@ local util = require 'gluon.util'
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['%%v'] = f:read():gsub('-SNAPSHOT', '')
subst['%%S'] = f:read()
subst['%%A'] = f:read()
f:close()
-subst['%%v'] = util.trim(fs.readfile('/etc/openwrt_version'))
subst['%%GS'] = site.site_code
subst['%%GV'] = util.trim(fs.readfile('/lib/gluon/gluon-version'))
subst['%%GR'] = util.trim(fs.readfile('/lib/gluon/release'))
--
GitLab