summaryrefslogtreecommitdiff
path: root/templates/system
diff options
context:
space:
mode:
Diffstat (limited to 'templates/system')
-rw-r--r--templates/system/package/repository/node.def17
-rw-r--r--templates/system/package/repository/node.tag/component/node.def2
-rw-r--r--templates/system/package/repository/node.tag/components/node.def4
-rw-r--r--templates/system/package/repository/node.tag/distribution/node.def4
-rw-r--r--templates/system/package/repository/node.tag/url/node.def2
5 files changed, 17 insertions, 12 deletions
diff --git a/templates/system/package/repository/node.def b/templates/system/package/repository/node.def
index 4fd6d587..75a61e55 100644
--- a/templates/system/package/repository/node.def
+++ b/templates/system/package/repository/node.def
@@ -1,14 +1,11 @@
tag:
type: txt
-help: "Repository name"
-# bug 1847: remove the previous repo line before adding new line.
-# need to prohibit '!' in repo name (sed delimiter)
-syntax: pattern $(@) "^[^!]+$" ; "Do not use '!' in repository name"
-create: "sudo sh -c \"touch /etc/apt/sources.list && \
-sed -i '\\!/ $(@) !d' /etc/apt/sources.list && \
-echo \\\"deb $(url/@)/ $(@) $(component/@)\\\" >> /etc/apt/sources.list\" "
+help: "Name describing the repository"
+commit: $(./url/) != ""; "Must configure the repository URL"
+commit: $(./distribution/) != ""; "Must configure the repository distribution"
+commit: $(./component/) != ""; "Must configure the repository component"
update: "sudo sh -c \"touch /etc/apt/sources.list && \
-sed -i '\\!/ $(@) !d' /etc/apt/sources.list && \
-echo \\\"deb $(url/@)/ $(@) $(component/@)\\\" >> /etc/apt/sources.list\" "
+sed -i '\\!# $(@) #!d' /etc/apt/sources.list && \
+echo \\\"deb $(url/@)/ $(distribution/@) $(component/@) # $(@) #\\\" >> /etc/apt/sources.list\" "
delete: "sudo sh -c \"touch /etc/apt/sources.list && \
-sed -i '\\! $(@) $(component/@)!d' /etc/apt/sources.list\" "
+sed -i '\\!# $(@) #!d' /etc/apt/sources.list\" "
diff --git a/templates/system/package/repository/node.tag/component/node.def b/templates/system/package/repository/node.tag/component/node.def
deleted file mode 100644
index e87f88de..00000000
--- a/templates/system/package/repository/node.tag/component/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: txt
-help: "Repository component names"
diff --git a/templates/system/package/repository/node.tag/components/node.def b/templates/system/package/repository/node.tag/components/node.def
new file mode 100644
index 00000000..3cc0dc24
--- /dev/null
+++ b/templates/system/package/repository/node.tag/components/node.def
@@ -0,0 +1,4 @@
+type: txt
+help: "Repository component names"
+# need to prohibit '!' in repo name (sed delimiter)
+syntax: pattern $(@) "^[^!]+$" ; "Do not use '!' in component name"
diff --git a/templates/system/package/repository/node.tag/distribution/node.def b/templates/system/package/repository/node.tag/distribution/node.def
new file mode 100644
index 00000000..ad54b70d
--- /dev/null
+++ b/templates/system/package/repository/node.tag/distribution/node.def
@@ -0,0 +1,4 @@
+type: txt
+help: "Distribution name"
+# need to prohibit '!' in repo name (sed delimiter)
+syntax: pattern $(@) "^[^!]+$" ; "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 0e304b91..ae05e6c6 100644
--- a/templates/system/package/repository/node.tag/url/node.def
+++ b/templates/system/package/repository/node.tag/url/node.def
@@ -1,2 +1,4 @@
type: txt
help: "Repository URL"
+# need to prohibit '!' in url (sed delimiter)
+syntax: pattern $(@) "^[^!]+$" ; "Do not use '!' in url"