From 622bbf801bd435a3848c669ff2c0e9090cd2bb4e Mon Sep 17 00:00:00 2001
From: An-Cheng Huang <ancheng@vyatta.com>
Date: Thu, 31 Jan 2008 07:59:02 -0800
Subject: convert templates to new syntax

---
 templates/system/package/repository/node.def           | 18 +++++++++---------
 .../package/repository/node.tag/components/node.def    |  4 ++--
 .../package/repository/node.tag/description/node.def   |  2 +-
 .../package/repository/node.tag/distribution/node.def  |  4 ++--
 .../system/package/repository/node.tag/url/node.def    |  4 ++--
 5 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'templates/system/package/repository')

diff --git a/templates/system/package/repository/node.def b/templates/system/package/repository/node.def
index d0c89e28..e07967ee 100644
--- a/templates/system/package/repository/node.def
+++ b/templates/system/package/repository/node.def
@@ -1,11 +1,11 @@
 tag:
 type: txt
-help: "Name describing the repository"
-commit: $(./url/) != ""; "Must configure the repository URL"
-commit: $(./distribution/) != ""; "Must configure the repository distribution"
-commit: $(./components/) != ""; "Must configure the repository component"
-update: "sudo sh -c \"touch /etc/apt/sources.list && \
-sed -i '\\!# $(@) #!d' /etc/apt/sources.list && \
-echo \\\"deb $(url/@)/ $(distribution/@) $(components/@) # $(@) #\\\" >> /etc/apt/sources.list\" "
-delete: "sudo sh -c \"touch /etc/apt/sources.list && \
-sed -i '\\!# $(@) #!d' /etc/apt/sources.list\" "
+help: Name describing the repository
+commit:expression: $VAR(./url/) != ""; "Must configure the repository URL"
+commit:expression: $VAR(./distribution/) != ""; "Must configure the repository distribution"
+commit:expression: $VAR(./components/) != ""; "Must configure the repository component"
+update:expression: "sudo sh -c \"touch /etc/apt/sources.list && \
+sed -i '\\!# $VAR(@) #!d' /etc/apt/sources.list && \
+echo \\\"deb $VAR(url/@)/ $VAR(distribution/@) $VAR(components/@) # $VAR(@) #\\\" >> /etc/apt/sources.list\" "
+delete:expression: "sudo sh -c \"touch /etc/apt/sources.list && \
+sed -i '\\!# $VAR(@) #!d' /etc/apt/sources.list\" "
diff --git a/templates/system/package/repository/node.tag/components/node.def b/templates/system/package/repository/node.tag/components/node.def
index 3cc0dc24..51ab9580 100644
--- a/templates/system/package/repository/node.tag/components/node.def
+++ b/templates/system/package/repository/node.tag/components/node.def
@@ -1,4 +1,4 @@
 type: txt
-help: "Repository component names"
+help: Repository component names
 # need to prohibit '!' in repo name (sed delimiter)
-syntax: pattern $(@) "^[^!]+$" ; "Do not use '!' in component name"
+syntax:expression: pattern $VAR(@) "^[^!]+$" ; "Do not use '!' in component name"
diff --git a/templates/system/package/repository/node.tag/description/node.def b/templates/system/package/repository/node.tag/description/node.def
index 9ce7dac6..e187f9e4 100644
--- a/templates/system/package/repository/node.tag/description/node.def
+++ b/templates/system/package/repository/node.tag/description/node.def
@@ -1,2 +1,2 @@
 type: txt
-help: "Repository description"
+help: Repository description
diff --git a/templates/system/package/repository/node.tag/distribution/node.def b/templates/system/package/repository/node.tag/distribution/node.def
index ad54b70d..39235a6a 100644
--- a/templates/system/package/repository/node.tag/distribution/node.def
+++ b/templates/system/package/repository/node.tag/distribution/node.def
@@ -1,4 +1,4 @@
 type: txt
-help: "Distribution name"
+help: Distribution name
 # need to prohibit '!' in repo name (sed delimiter)
-syntax: pattern $(@) "^[^!]+$" ; "Do not use '!' in distribution name"
+syntax:expression: pattern $VAR(@) "^[^!]+$" ; "Do not use '!' in distribution name"
diff --git a/templates/system/package/repository/node.tag/url/node.def b/templates/system/package/repository/node.tag/url/node.def
index ae05e6c6..7c84afce 100644
--- a/templates/system/package/repository/node.tag/url/node.def
+++ b/templates/system/package/repository/node.tag/url/node.def
@@ -1,4 +1,4 @@
 type: txt
-help: "Repository URL"
+help: Repository URL
 # need to prohibit '!' in url (sed delimiter)
-syntax: pattern $(@) "^[^!]+$" ; "Do not use '!' in url"
+syntax:expression: pattern $VAR(@) "^[^!]+$" ; "Do not use '!' in url"
-- 
cgit v1.2.3