Merge pull request #106 from christyjacob4/fix-cli-function-packaging-issue

Fix cli function packaging issue

Author: eldadfux

templates/cli/app/services/help.php.twig

@@ -16,6 +16,6 @@ printf("\nUsage : appwrite [SERVICE] [COMMAND] --[OPTION]\n\n");
 printf("Services :\n");
 $mask = "\t%-20.20s %-125.125s\n";
 {% for service in spec.services %}
-printf($mask, "{{ service.name }}", "{{ service.description }}");
+printf($mask, "{{ service.name }}", "{{ service.description | replace({'"':'\''}) | raw }}");
 {% endfor %}
 printf("\nRun 'appwrite [SERVICE] help' for more information on a service.\n");

templates/cli/app/services/service.php.twig

@@ -72,14 +72,14 @@ $cli
 {% if parameter.type == 'file' and method.packaging %}
         $cloudFunctionPath = realpath(__DIR__.'/../../../files/'.${{ parameter.name | caseCamel }});
         $cloudFunctionParentDir = dirname($cloudFunctionPath, 1);
-        $cloudFunctionDirName = basename(${{ parameter.name | caseCamel }});
+        $cloudFunctionDirName = basename($cloudFunctionPath);
         if (file_exists($cloudFunctionPath) === false ) {
             throw new Exception("Path doesn't exist. Please ensure that the path is within the current directory. "); 
         }
         $archiveName = 'code.tar.gz';
         $volumeMountPoint = realpath(__DIR__.'/../../../files/');
-        exec("tar -zcvf $archiveName --exclude=$archiveName -C ${cloudFunctionParentDir} $cloudFunctionDirName && mv ${archiveName} ${volumeMountPoint}");
-        $archivePath = realpath($volumeMountPoint."/$archiveName");$archivePath = realpath($volumeMountPoint."/$archiveName");
+        exec("tar -zcvf $archiveName -C $cloudFunctionParentDir $cloudFunctionDirName && mv $archiveName $volumeMountPoint");
+        $archivePath = realpath($volumeMountPoint."/$archiveName");
         $cFile = new \CURLFile($archivePath,  'application/x-gzip' , basename($archivePath));
         
         $params['{{ parameter.name }}'] = $cFile;

templates/cli/bin/service.twig

@@ -1,3 +1,7 @@
 #!/bin/sh
 
-php /usr/local/code/app/{{ spec.title | caseUcfirst}}/Services/{{service.name | caseDash}}.php $@
+if [[ -z "$@" ]]; then
+   php /usr/local/code/app/{{ spec.title | caseUcfirst}}/Services/{{service.name | caseDash}}.php help
+else
+   php /usr/local/code/app/{{ spec.title | caseUcfirst}}/Services/{{service.name | caseDash}}.php $@
+fi