rename setup_env to setup_env.sh

Azure · Oct 20, 2016 · bb0c9cf · bb0c9cf
1 parent 0bbe3d1
commit bb0c9cf
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/bosh-setup/azuredeploy.json b/bosh-setup/azuredeploy.json
@@ -113,7 +113,7 @@
 
     "baseUriAzureCloud": "https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/bosh-setup/",
     "filesToDownloadAzureCloud": [
-      "[uri(variables('baseUriAzureCloud'), 'scripts/setup_env')]",
+      "[uri(variables('baseUriAzureCloud'), 'scripts/setup_env.sh')]",
       "[uri(variables('baseUriAzureCloud'), 'scripts/setup_env.py')]",
       "[uri(variables('baseUriAzureCloud'), 'scripts/create_cert.sh')]",
       "[uri(variables('baseUriAzureCloud'), 'scripts/utils.sh')]",
@@ -129,7 +129,7 @@
     "templateVersion": "v2-1-1",
     "baseUriAzureChinaCloudWithVersion": "[concat(variables('baseUriAzureChinaCloud'), variables('templateVersion'), '/')]",
     "filesToDownloadAzureChinaCloud": [
-      "[uri(variables('baseUriAzureChinaCloudWithVersion'), 'scripts/setup_env')]",
+      "[uri(variables('baseUriAzureChinaCloudWithVersion'), 'scripts/setup_env.sh')]",
       "[uri(variables('baseUriAzureChinaCloudWithVersion'), 'scripts/setup_env.py')]",
       "[uri(variables('baseUriAzureChinaCloudWithVersion'), 'scripts/create_cert.sh')]",
       "[uri(variables('baseUriAzureChinaCloudWithVersion'), 'scripts/utils.sh')]",
@@ -568,7 +568,7 @@
           "fileUris": "[variables('filesToDownload')]"
         },
         "protectedSettings": {
-          "commandToExecute": "[concat('bash -l -c \"./setup_env', ' ', parameters('tenantID'), ' ', parameters('clientID'), ' ', base64(parameters('clientSecret')), ' >/home/', parameters('adminUsername'), '/install.log 2>&1\"')]"
+          "commandToExecute": "[concat('bash -l -c \"./setup_env.sh', ' ', parameters('tenantID'), ' ', parameters('clientID'), ' ', base64(parameters('clientSecret')), ' >/home/', parameters('adminUsername'), '/install.log 2>&1\"')]"
         }
       }
     }

diff --git a/bosh-setup/scripts/setup_env → bosh-setup/scripts/setup_env.sh b/bosh-setup/scripts/setup_env → bosh-setup/scripts/setup_env.sh
diff --git a/bosh-setup/update-china-storage-account.sh b/bosh-setup/update-china-storage-account.sh
@@ -3,13 +3,13 @@
 # The template version should be same as variables('templateVersion') in azuredeploy.json
 template_version="$1"
 container_name="bosh-setup"
-
-azure storage blob upload scripts/create_cert.sh ${container_name} ${template_version}/scripts/create_cert.sh
-azure storage blob upload scripts/deploy_bosh.sh ${container_name} ${template_version}/scripts/deploy_bosh.sh
-azure storage blob upload scripts/deploy_cloudfoundry.sh ${container_name} ${template_version}/scripts/deploy_cloudfoundry.sh
-azure storage blob upload scripts/init.sh ${container_name} ${template_version}/scripts/init.sh
-azure storage blob upload scripts/setup_env ${container_name} ${template_version}/scripts/setup_env
-azure storage blob upload scripts/setup_env.py ${container_name} ${template_version}/scripts/setup_env.py
-azure storage blob upload manifests/bosh.yml ${container_name} ${template_version}/manifests/bosh.yml
-azure storage blob upload manifests/single-vm-cf.yml ${container_name} ${template_version}/manifests/single-vm-cf.yml
-azure storage blob upload manifests/multiple-vm-cf.yml ${container_name} ${template_version}/manifests/multiple-vm-cf.yml
+directories="scripts manifests"
+for directory in $directories
+  do
+  for file in $directory/*
+  do
+    if [[ -f $file ]]; then
+      azure storage blob upload $file ${container_name} ${template_version}/$file
+    fi
+  done
+done