style: Proper indentation on automation scripts

Author: gcarreno

utilities/common/utilities.data.config.pas

@@ -31,14 +31,14 @@ interface
 { TConfig }
   TConfig = class(TObject)
   private
-    FRootFolder: String;
-    FEntriesFolder: String;
-    FResultsFolder: String;
-    FBinFolder: String;
-    FInput: String;
-    FHyperfine: String;
-    FLazbuild: String;
-    FOutputHash: String;
+    FRootFolder: TJSONStringType;
+    FEntriesFolder: TJSONStringType;
+    FResultsFolder: TJSONStringType;
+    FBinFolder: TJSONStringType;
+    FInput: TJSONStringType;
+    FHyperfine: TJSONStringType;
+    FLazbuild: TJSONStringType;
+    FOutputHash: TJSONStringType;
     FEntries: TEntries;
 
     //procedure setFromJSON(const AJSON: TJSONStringType);
@@ -52,28 +52,28 @@   TConfig = class(TObject)
 
     destructor Destroy; override;
 
-    property RootFolder: String
+    property RootFolder: TJSONStringType
       read FRootFolder
       write FRootFolder;
-    property EntriesFolder: String
+    property EntriesFolder: TJSONStringType
       read FEntriesFolder
       write FEntriesFolder;
-    property ResultsFolder: String
+    property ResultsFolder: TJSONStringType
       read FResultsFolder
       write FResultsFolder;
-    property BinFolder: String
+    property BinFolder: TJSONStringType
       read FBinFolder
       write FBinFolder;
-    property Input: String
+    property Input: TJSONStringType
       read FInput
       write FInput;
-    property Hyperfine: String
+    property Hyperfine: TJSONStringType
       read FHyperfine
       write FHyperfine;
-    property Lazbuild: String
+    property Lazbuild: TJSONStringType
       read FLazbuild
       write FLazbuild;
-    property OutputHash: String
+    property OutputHash: TJSONStringType
       read FOutputHash
       write FOutputHash;
     property Entries: TEntries

utilities/script_builder/Common/scriptbuilder.common.pas

@@ -141,7 +141,7 @@ procedure TBuilder.BuildCompileScriptBash;
 var
   index: Integer;
   //entry: TEntry;
-  line: String;
+  line: TJSONStringType;
 begin
   FScriptFile:= IncludeTrailingPathDelimiter(FConfig.RootFolder) + cCompileBash;
   FScriptStream:= TFileStream.Create(FScriptFile, fmCreate);
@@ -157,7 +157,7 @@ procedure TBuilder.BuildCompileScriptBash;
       if FConfig.Entries[index].Compiler <> cCompilerFPC then continue;
       //if FConfig.Entries[index].EntryBinary = cBaselineBinary then continue;
       line:= line + 'function ' + FConfig.Entries[index].EntryBinary + '() {' + LineEnding + LineEnding;
-      line:= line + 'echo "===== '+ FConfig.Entries[index].Name +' ======"' + LineEnding;
+      line:= line + '  echo "===== '+ FConfig.Entries[index].Name +' ======"' + LineEnding;
       if FConfig.Entries[index].HasRelease then
       begin
        line:= line  +
@@ -188,8 +188,8 @@ procedure TBuilder.BuildCompileScriptBash;
         ] ) +
         LineEnding;
       end;
-      line:= line + 'echo "==========="' + LineEnding;
-      line:= line + 'echo' + LineEnding + LineEnding + '}' + LineEnding + LineEnding;
+      line:= line + '  echo "==========="' + LineEnding;
+      line:= line + '  echo' + LineEnding + LineEnding + '}' + LineEnding + LineEnding;
     end;
     line:= line + 'if [ $1 == "" ];then'  + LineEnding;
     for index:= 0 to Pred(FConfig.Entries.Count) do
@@ -231,7 +231,7 @@ procedure TBuilder.BuildCompileScriptPowerShell;
 procedure TBuilder.BuildTestScriptBash;
 var
   index: Integer;
-  line, tmpStr: String;
+  line, tmpStr: TJSONStringType;
 begin
   FScriptFile:= IncludeTrailingPathDelimiter(FConfig.RootFolder) + cTestBash;
   FScriptStream:= TFileStream.Create(FScriptFile, fmCreate);
@@ -245,7 +245,7 @@ procedure TBuilder.BuildTestScriptBash;
       if not FConfig.Entries[index].Active then continue;
       //if FConfig.Entries[index].EntryBinary = cBaselineBinary then continue;
       line:= line + 'function ' + FConfig.Entries[index].EntryBinary + '() {' + LineEnding + LineEnding;
-      line:= line + 'echo "===== '+ FConfig.Entries[index].Name +' ======"' + LineEnding;
+      line:= line + '  echo "===== '+ FConfig.Entries[index].Name +' ======"' + LineEnding;
       tmpStr:= Format('%s%s %s', [
         IncludeTrailingPathDelimiter(FConfig.BinFolder),
         FConfig.Entries[index].EntryBinary,
@@ -263,22 +263,26 @@ procedure TBuilder.BuildTestScriptBash;
         ],
         [rfReplaceAll]
       );
-      tmpStr:= Format('%s > %s%s.output', [
+      tmpStr:= Format('  %s > %s%s.output', [
         tmpStr,
         IncludeTrailingPathDelimiter(FConfig.ResultsFolder),
         FConfig.Entries[index].EntryBinary
       ]);
       line:= line + tmpStr + LineEnding;
-      tmpStr:= Format('sha256sum %s%s.output',[
+      tmpStr:= Format('  sha256sum %s%s.output',[
         IncludeTrailingPathDelimiter(FConfig.ResultsFolder),
         FConfig.Entries[index].EntryBinary
       ]);
       line:= line + tmpStr + LineEnding;
-      line:= line + Format('echo "%s  Official Output Hash"',[
+      line:= line + Format('  echo "%s  Official Output Hash"',[
         FConfig.OutputHash
       ]) + LineEnding;
-      line:= line + 'echo "==========="' + LineEnding;
-      line:= line + 'echo' + LineEnding + LineEnding + '}' + LineEnding + LineEnding;
+      line:= line + Format('  rm %s%s.output',[
+        IncludeTrailingPathDelimiter(FConfig.ResultsFolder),
+        FConfig.Entries[index].EntryBinary
+      ]) + LineEnding;
+      line:= line + '  echo "==========="' + LineEnding;
+      line:= line + '  echo' + LineEnding + LineEnding + '}' + LineEnding + LineEnding;
     end;
     line:= line + 'if [ $1 == "" ];then'  + LineEnding;
     for index:= 0 to Pred(FConfig.Entries.Count) do
@@ -311,7 +315,7 @@ procedure TBuilder.BuildTestScriptBash;
 procedure TBuilder.BuildRunScriptBash;
 var
   index: Integer;
-  line, tmpStr: String;
+  line, tmpStr: TJSONStringType;
 begin
   FScriptFile:= IncludeTrailingPathDelimiter(FConfig.RootFolder) + cRunBash;
   FScriptStream:= TFileStream.Create(FScriptFile, fmCreate);
@@ -325,7 +329,7 @@ procedure TBuilder.BuildRunScriptBash;
       if not FConfig.Entries[index].Active then continue;
       if FConfig.Entries[index].EntryBinary = cBaselineBinary then continue;
       line:= line + 'function ' + FConfig.Entries[index].EntryBinary + '() {' + LineEnding + LineEnding;
-      line:= line + 'echo "===== '+ FConfig.Entries[index].Name +' ======"' + LineEnding;
+      line:= line + '  echo "===== '+ FConfig.Entries[index].Name +' ======"' + LineEnding;
       // Run for SSD
       tmpStr:= StringsReplace(
         FConfig.Hyperfine,
@@ -360,9 +364,9 @@ procedure TBuilder.BuildRunScriptBash;
         ],
         [rfReplaceAll]
       );
-      line:= line + 'echo "-- SSD --"' + LineEnding + tmpStr + LineEnding;
-      line:= line + 'echo "==========="' + LineEnding;
-      line:= line + 'echo' + LineEnding + LineEnding + '}' + LineEnding + LineEnding;
+      line:= line + '  echo "-- SSD --"' + LineEnding + '  ' + tmpStr + LineEnding;
+      line:= line + '  echo "==========="' + LineEnding;
+      line:= line + '  echo' + LineEnding + LineEnding + '}' + LineEnding + LineEnding;
     end;
     line:= line + 'if [ $1 == "" ];then'  + LineEnding;
     for index:= 0 to Pred(FConfig.Entries.Count) do