Merge f9f6560514 into f3d02b9c46

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"
 ```
 
@@ -25,19 +24,15 @@ Either proceed manually (https://divestos.org/pages/build#init) or use the scrip
     ./phase-1.sh "20.0" |& tee phase-1.log
     ```
 
-  b. Choose your options (optional)
+  b. Set options (optional)
+
+    See Scripts/init.sh for available options. For example:
 
     ```sh
-    nano DivestOS/Scripts/init.sh
+    export DOS_BRANDING_ORG="My Company"
     ```
 
-  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 +41,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

Container/phase-1.sh

@@ -32,13 +32,6 @@ else
   echo "WARNING: gocryptfs failed. Signing keys will not be encrypted!"
 fi
 
-# Update paths
-# https://backreference.org/2009/12/09/using-shell-variables-in-sed/index.html
-safe_pattern=$(printf '%s\n' "$(pwd)" | sed 's/[[\.*^$/]/\\&/g')
-sed -i "s/\(^export DOS_WORKSPACE_ROOT=\).*/\1\"$safe_pattern\"/" Scripts/init.sh
-safe_pattern=$(printf '%s\n' "$(pwd)/Builds" | sed 's/[[\.*^$/]/\\&/g')
-sed -i "s/\(^export DOS_BUILDS=\).*/\1\"$safe_pattern\"/" Scripts/init.sh
-
 # Add the initial manifest
 cd "Build/LineageOS-$version/"
 cat "../../Manifests/Manifest_LAOS-$version.xml" > .repo/local_manifests/local_manifest.xml

Container/phase-2.sh

@@ -10,6 +10,11 @@ if [ "$2" = "" ]; then
   exit 1
 fi
 
+# Update paths
+DOS_WORKSPACE_ROOT="$(pwd)/DivestOS"
+export DOS_WORKSPACE_ROOT
+export DOS_BUILDS="$DOS_WORKSPACE_ROOT/Builds"
+
 cd "DivestOS/Build/LineageOS-$version"
 
 # Download