From 99579f621d3ab0f704e7b20ca0c23f8e23310f07 Mon Sep 17 00:00:00 2001
From: Aleksandr Chebotov <v-aleche@microsoft.com>
Date: Thu, 14 May 2020 17:07:13 +0300
Subject: [PATCH] move preparemetadata.sh to installers folder

---
 .../scripts/installers/1604/preparemetadata.sh      | 13 -------------
 .../scripts/installers/1804/preparemetadata.sh      | 13 -------------
 .../installers/{2004 => }/preparemetadata.sh        |  0
 images/linux/ubuntu1604.json                        |  2 +-
 images/linux/ubuntu1804.json                        |  2 +-
 images/linux/ubuntu2004.json                        |  2 +-
 6 files changed, 3 insertions(+), 29 deletions(-)
 delete mode 100644 images/linux/scripts/installers/1604/preparemetadata.sh
 delete mode 100644 images/linux/scripts/installers/1804/preparemetadata.sh
 rename images/linux/scripts/installers/{2004 => }/preparemetadata.sh (100%)

diff --git a/images/linux/scripts/installers/1604/preparemetadata.sh b/images/linux/scripts/installers/1604/preparemetadata.sh
deleted file mode 100644
index a26e10968..000000000
--- a/images/linux/scripts/installers/1604/preparemetadata.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-################################################################################
-##  File:  preparemetadata.sh
-##  Desc:  This script adds a image title information to the metadata
-##         document
-################################################################################
-
-source $HELPER_SCRIPTS/document.sh
-
-WriteItem "<!--- DO NOT EDIT - This markdown file is autogenerated. -->"
-AddTitle "$(lsb_release -ds)"
-WriteItem "The following software is installed on machines with the $IMAGE_VERSION update."
-WriteItem "***"
diff --git a/images/linux/scripts/installers/1804/preparemetadata.sh b/images/linux/scripts/installers/1804/preparemetadata.sh
deleted file mode 100644
index e3304945a..000000000
--- a/images/linux/scripts/installers/1804/preparemetadata.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-################################################################################
-##  File:  preparemetadata.sh
-##  Desc:  This script adds a image title information to the metadata
-##         document
-################################################################################
-
-source $HELPER_SCRIPTS/document.sh
-
-WriteItem "<!--- DO NOT EDIT - This markdown file is autogenerated. -->"
-AddTitle "$(lsb_release -ds)"
-WriteItem "The following software is installed on machines with the $IMAGE_VERSION update."
-WriteItem "***"
\ No newline at end of file
diff --git a/images/linux/scripts/installers/2004/preparemetadata.sh b/images/linux/scripts/installers/preparemetadata.sh
similarity index 100%
rename from images/linux/scripts/installers/2004/preparemetadata.sh
rename to images/linux/scripts/installers/preparemetadata.sh
diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json
index 5aa162f0d..dce22d126 100644
--- a/images/linux/ubuntu1604.json
+++ b/images/linux/ubuntu1604.json
@@ -101,7 +101,7 @@
         {
             "type": "shell",
             "scripts":[
-                "{{template_dir}}/scripts/installers/1604/preparemetadata.sh"
+                "{{template_dir}}/scripts/installers/preparemetadata.sh"
             ],
             "environment_vars": [
                 "IMAGE_VERSION={{user `image_version`}}",
diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json
index 8408704f5..7e5421c1b 100644
--- a/images/linux/ubuntu1804.json
+++ b/images/linux/ubuntu1804.json
@@ -104,7 +104,7 @@
         {
             "type": "shell",
             "scripts":[
-                "{{template_dir}}/scripts/installers/1804/preparemetadata.sh"
+                "{{template_dir}}/scripts/installers/preparemetadata.sh"
             ],
             "environment_vars": [
                 "IMAGE_VERSION={{user `image_version`}}",
diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json
index 1026f6de9..508406efe 100644
--- a/images/linux/ubuntu2004.json
+++ b/images/linux/ubuntu2004.json
@@ -104,7 +104,7 @@
         {
             "type": "shell",
             "scripts":[
-                "{{template_dir}}/scripts/installers/2004/preparemetadata.sh"
+                "{{template_dir}}/scripts/installers/preparemetadata.sh"
             ],
             "environment_vars": [
                 "IMAGE_VERSION={{user `image_version`}}",