Build description from settings.

This eliminates a manual step in the build process.

Author: ryneeverett

Container/README.md

@@ -10,7 +10,6 @@ required arguments:
 - $1 - path where android build will end up
 
 ```sh
-mkdir android
 ./run-image-{podman,docker}.sh "$(pwd)/Builds"
 ```
 
@@ -31,13 +30,7 @@ Either proceed manually (https://divestos.org/pages/build#init) or use the scrip
     nano DivestOS/Scripts/init.sh
     ```
 
-  c. Update description (optional)
-
-    ```sh
-    nano DivestOS/Scripts/Generate_Signing_Keys.sh
-    ```
-
-  d. Add vendor blobs
+  c. Add vendor blobs
 
     ```sh
     githuborg=""  # <-- put the correct github organization here
@@ -46,7 +39,7 @@ Either proceed manually (https://divestos.org/pages/build#init) or use the scrip
     sed -i "/gitlab/s/\[COLOUR IN THE LINES\]/$gitlaborg/g" DivestOS/Build/LineageOS-20.0/.repo/local_manifests/local_manifest.xml
     ```
 
-  e. Download and Build
+  d. Download and Build
 
     ```sh
     # $1: version

Scripts/Generate_Signing_Keys.sh

@@ -30,7 +30,7 @@ if [[ -d "$DOS_SIGNING_KEYS" ]]; then
 	cd "$DOS_SIGNING_KEYS/NEW";
 	mkdir $1; cd $1;
 
-	desc="/O=Divested Computing Group/CN=DivestOS for $1/emailAddress=[email protected]";
+	desc="/O=$DOS_BRANDING_ORG/CN=$DOS_BRANDING_NAME for $1/emailAddress=$DOS_BRANDING_EMAIL";
 
 	sed -i '/blank for none/,+1 d' "$DOS_BUILD_BASE"/development/tools/make_key;
 

Scripts/init.sh

@@ -73,7 +73,9 @@ export DOS_GPG_SIGNING=true;
 export DOS_GPG_SIGNING_KEY="B8744D67F9F1E14E145DFD8E7F627E920F316994";
 
 #Branding
+export DOS_BRANDING_ORG="Divested Computing Group";
 export DOS_BRANDING_NAME="DivestOS";
+export DOS_BRANDING_EMAIL="[email protected]";
 export DOS_BRANDING_ZIP_PREFIX="divested";
 export DOS_BRANDING_BOOTANIMATION_FONT="Fira-Sans-Heavy"; #Options: $ convert -list font
 export DOS_BRANDING_BOOTANIMATION_STYLE="plasma"; #Options: gradient, plasma