From 25b8f6c02b4dbd4bd0f1a3e75f166b4dd52648d0 Mon Sep 17 00:00:00 2001
From: Nikolaos Karaolidis <nick@karaolidis.com>
Date: Tue, 13 Jun 2023 14:58:40 +0300
Subject: [PATCH] Update options.json handling

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
---
 Dockerfile   | 12 +++++++++---
 README.md    |  7 ++++---
 config.toml  |  1 -
 options.json | 11 +++++++++++
 4 files changed, 24 insertions(+), 7 deletions(-)
 create mode 100644 options.json

diff --git a/Dockerfile b/Dockerfile
index 8db5fdc..530e17e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,18 @@
 FROM ubuntu
 
-RUN apt-get update && apt-get install -y git jq openjdk-17-jdk zip wget
+RUN apt-get update && apt-get install -y gettext-base git jq openjdk-17-jdk zip wget
 RUN git clone --recurse https://github.com/revanced-apks/build-apps.git /app
 
 WORKDIR /app
-RUN sed -i 's/--keystore=ks\.keystore/--keystore=ks\.keystore --options=build\/.options.json/' utils.sh
-RUN sed -i 's/$(nproc)/2/g' build.sh
 COPY config.toml config.toml
+COPY options.json options.json
+
+RUN sed -i 's/--keystore=ks\.keystore/--keystore=ks\.keystore --options=options.json/' utils.sh
+RUN sed -i 's/$(nproc)/2/g' build.sh
+RUN sed -i 's/patch_apk() {/patch_apk() {\n    envsubst < options.json > options.json.tmp\n    mv options.json.tmp options.json/' utils.sh
+
+ENV GITHUB_TOKEN=
+ENV REDDIT_OAUTH_CLIENT_ID=
 
 RUN groupadd -g 1000 revanced
 RUN useradd -u 1000 -g revanced revanced
diff --git a/README.md b/README.md
index 904b417..3b3779a 100644
--- a/README.md
+++ b/README.md
@@ -8,9 +8,10 @@ docker run -v $(pwd)/build:/app/build -e GITHUB_TOKEN=YOUR_GITHUB_TOKEN registry
 
 ## Environment Variables
 
-| Environment Variable | Description                                  |
-| -------------------- | -------------------------------------------- |
-| `GITHUB_TOKEN`       | Github token to use for downloading patches. |
+| Environment Variable     | Description                                                |
+| ------------------------ | ---------------------------------------------------------- |
+| `GITHUB_TOKEN`           | Github token to use for downloading patches.               |
+| `REDDIT_OAUTH_CLIENT_ID` | Reddit OAuth Client ID for "change-oauth-client-id" patch. |
 
 ## Volumes
 
diff --git a/config.toml b/config.toml
index fc6bf92..c7537b1 100644
--- a/config.toml
+++ b/config.toml
@@ -34,7 +34,6 @@ arch = "arm64-v8a"
 apkmirror-dlurl = "https://www.apkmirror.com/apk/redditinc/reddit/"
 
 [Sync]
-app-name = ".sync"
 apkmirror-dlurl = "https://www.apkmirror.com/apk/red-apps-ltd/sync-for-reddit/"
 
 [Spotify]
diff --git a/options.json b/options.json
new file mode 100644
index 0000000..891ce9b
--- /dev/null
+++ b/options.json
@@ -0,0 +1,11 @@
+[
+  {
+    "patchName": "change-oauth-client-id",
+    "options": [
+      {
+        "key": "client-id",
+        "value": "$REDDIT_OAUTH_CLIENT_ID"
+      }
+    ]
+  }
+]