From 3304f857862f1294eecf1d7993317c5f7f9e2bc2 Mon Sep 17 00:00:00 2001 From: Limezy Date: Sat, 28 Jan 2023 16:02:16 +0700 Subject: [PATCH 1/7] Patch Updates --- sources/patches/app-04-bible.patch | 50 ++++++++++++++++-------------- sources/patches/app-06-logo.patch | 13 ++++++++ 2 files changed, 39 insertions(+), 24 deletions(-) create mode 100644 sources/patches/app-06-logo.patch diff --git a/sources/patches/app-04-bible.patch b/sources/patches/app-04-bible.patch index 37961d1..3aaf998 100644 --- a/sources/patches/app-04-bible.patch +++ b/sources/patches/app-04-bible.patch @@ -1,29 +1,31 @@ -diff --git a/app/editor/menus/block.tsx b/app/editor/menus/block.tsx -index 42269b5e4..f5e5041e3 100644 +diff --cc app/editor/menus/block.tsx +index 42269b5e4,cd6830b12..000000000 --- a/app/editor/menus/block.tsx +++ b/app/editor/menus/block.tsx -@@ -19,6 +19,7 @@ import { - ClockIcon, - CalendarIcon, - MathIcon, -+ BookmarkedIcon, - } from "outline-icons"; - import * as React from "react"; - import styled from "styled-components"; -@@ -187,6 +188,13 @@ export default function blockMenuItems(dictionary: Dictionary): MenuItem[] { - keywords: "notice card suggestion", - attrs: { style: "tip" }, - }, -+ { -+ name: "container_notice", -+ title: dictionary.bibleNotice, -+ icon: BookmarkedIcon, -+ keywords: "notice card suggestion", -+ attrs: { style: "bible" }, -+ }, - { - name: "separator", - }, +@@@ -18,7 -18,7 +18,8 @@@ import + AttachmentIcon, + ClockIcon, + CalendarIcon, + + MathIcon, ++ BookmarkedIcon, + } from "outline-icons"; + import * as React from "react"; + import styled from "styled-components"; +@@@ -187,6 -181,13 +188,13 @@@ export default function blockMenuItems( + keywords: "notice card suggestion", + attrs: { style: "tip" }, + }, ++ { ++ name: "container_notice", ++ title: dictionary.bibleNotice, + - icon: BookmarkedIcon, +++ icon: , ++ keywords: "notice card suggestion", ++ attrs: { style: "bible" }, ++ }, + { + name: "separator", + }, diff --git a/app/hooks/useDictionary.ts b/app/hooks/useDictionary.ts index 5b9196de5..90caf27d7 100644 --- a/app/hooks/useDictionary.ts diff --git a/sources/patches/app-06-logo.patch b/sources/patches/app-06-logo.patch new file mode 100644 index 0000000..08e50cf --- /dev/null +++ b/sources/patches/app-06-logo.patch @@ -0,0 +1,13 @@ +diff --git a/app/components/Icons/OutlineIcon.tsx b/app/components/Icons/OutlineIcon.tsx +index 05fa32927..15c06887b 100644 +--- a/app/components/Icons/OutlineIcon.tsx ++++ b/app/components/Icons/OutlineIcon.tsx +@@ -22,7 +22,7 @@ export default function OutlineIcon({ + viewBox={cover ? "2 2 20 20" : "0 0 24 24"} + version="1.1" + > +- ++ + + ); + } \ No newline at end of file From 50336bc0ccef55a7355875cc9777ab3983318ed9 Mon Sep 17 00:00:00 2001 From: Limezy Date: Sun, 29 Jan 2023 14:49:32 +0700 Subject: [PATCH 2/7] Update app.src --- conf/app.src | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/app.src b/conf/app.src index ebaaf08..5162bc3 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/outline/outline/archive/21ce145f67b26cd7c4493258c65b5d1731b23a79.zip -SOURCE_SUM=610604b495a7972fd5140d14d53b8e1b891e9caf0aec53856cbe229f5c76eb77 +SOURCE_URL=https://github.com/outline/outline/archive/f0d9bb4898642ca65bde42c8c53d1a4c6dc72e0d.zip +SOURCE_SUM=0788a176da28b52433a19d7144878ad8c2fad3b2893a22aa69285a1f6c356731 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true From 0bb07bfbefa395cc99ea80ec8ca8127a47f94e6a Mon Sep 17 00:00:00 2001 From: Limezy Date: Sun, 29 Jan 2023 15:10:31 +0700 Subject: [PATCH 3/7] Update app-04-bible.patch --- sources/patches/app-04-bible.patch | 50 ++++++++++++++---------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/sources/patches/app-04-bible.patch b/sources/patches/app-04-bible.patch index 3aaf998..1d5ab5a 100644 --- a/sources/patches/app-04-bible.patch +++ b/sources/patches/app-04-bible.patch @@ -1,31 +1,29 @@ -diff --cc app/editor/menus/block.tsx -index 42269b5e4,cd6830b12..000000000 +diff --git a/app/editor/menus/block.tsx b/app/editor/menus/block.tsx +index 42269b5e4..c40350908 100644 --- a/app/editor/menus/block.tsx +++ b/app/editor/menus/block.tsx -@@@ -18,7 -18,7 +18,8 @@@ import - AttachmentIcon, - ClockIcon, - CalendarIcon, - + MathIcon, -+ BookmarkedIcon, - } from "outline-icons"; - import * as React from "react"; - import styled from "styled-components"; -@@@ -187,6 -181,13 +188,13 @@@ export default function blockMenuItems( - keywords: "notice card suggestion", - attrs: { style: "tip" }, - }, -+ { -+ name: "container_notice", -+ title: dictionary.bibleNotice, - - icon: BookmarkedIcon, -++ icon: , -+ keywords: "notice card suggestion", -+ attrs: { style: "bible" }, -+ }, - { - name: "separator", - }, +@@ -19,6 +19,7 @@ import { + ClockIcon, + CalendarIcon, + MathIcon, ++ BookmarkedIcon, + } from "outline-icons"; + import * as React from "react"; + import styled from "styled-components"; +@@ -187,6 +188,13 @@ export default function blockMenuItems(dictionary: Dictionary): MenuItem[] { + keywords: "notice card suggestion", + attrs: { style: "tip" }, + }, ++ { ++ name: "container_notice", ++ title: dictionary.bibleNotice, ++ icon: , ++ keywords: "notice card suggestion", ++ attrs: { style: "bible" }, ++ }, + { + name: "separator", + }, diff --git a/app/hooks/useDictionary.ts b/app/hooks/useDictionary.ts index 5b9196de5..90caf27d7 100644 --- a/app/hooks/useDictionary.ts From 7cf0816cc77c7cdc78cf025135e378d3b676274e Mon Sep 17 00:00:00 2001 From: Limezy Date: Sun, 29 Jan 2023 15:27:10 +0700 Subject: [PATCH 4/7] Update upgrade --- scripts/upgrade | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index 43593a4..34a204c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -85,6 +85,11 @@ ynh_system_user_create --username=$app --home_dir="$final_path" if [ "$upgrade_type" == "UPGRADE_APP" ] then + ynh_script_progression --message="Cleaning up files..." --weight=1 + # Void and recreate final_path + ynh_secure_remove --file="$final_path" + ynh_exec_warn_less mkdir "$final_path" + ynh_script_progression --message="Upgrading source files..." --weight=1 # Download, check integrity, uncompress and patch the source from app.src From 343ee4c9929a352d9a9ce3d1b81dcc100a6fe3dd Mon Sep 17 00:00:00 2001 From: Limezy Date: Sun, 29 Jan 2023 15:28:27 +0700 Subject: [PATCH 5/7] Update upgrade --- scripts/upgrade | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index 43593a4..34a204c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -85,6 +85,11 @@ ynh_system_user_create --username=$app --home_dir="$final_path" if [ "$upgrade_type" == "UPGRADE_APP" ] then + ynh_script_progression --message="Cleaning up files..." --weight=1 + # Void and recreate final_path + ynh_secure_remove --file="$final_path" + ynh_exec_warn_less mkdir "$final_path" + ynh_script_progression --message="Upgrading source files..." --weight=1 # Download, check integrity, uncompress and patch the source from app.src From f364b09117a9983bc5159445668e6d06821dadc1 Mon Sep 17 00:00:00 2001 From: Limezy Date: Thu, 2 Feb 2023 01:06:52 +0700 Subject: [PATCH 6/7] Update upgrade --- scripts/upgrade | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 34a204c..1300fbd 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -84,16 +84,11 @@ ynh_system_user_create --username=$app --home_dir="$final_path" #================================================= if [ "$upgrade_type" == "UPGRADE_APP" ] -then - ynh_script_progression --message="Cleaning up files..." --weight=1 - # Void and recreate final_path - ynh_secure_remove --file="$final_path" - ynh_exec_warn_less mkdir "$final_path" - +then ynh_script_progression --message="Upgrading source files..." --weight=1 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" + ynh_setup_source --dest_dir="$final_path" --full_replace=1 fi chmod 750 "$final_path" From fa48253cc78f4e49522068ba3a32991c8dfc0a9e Mon Sep 17 00:00:00 2001 From: Limezy Date: Thu, 2 Feb 2023 01:21:31 +0700 Subject: [PATCH 7/7] Delete app-06-logo.patch --- sources/patches/app-06-logo.patch | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 sources/patches/app-06-logo.patch diff --git a/sources/patches/app-06-logo.patch b/sources/patches/app-06-logo.patch deleted file mode 100644 index 08e50cf..0000000 --- a/sources/patches/app-06-logo.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/app/components/Icons/OutlineIcon.tsx b/app/components/Icons/OutlineIcon.tsx -index 05fa32927..15c06887b 100644 ---- a/app/components/Icons/OutlineIcon.tsx -+++ b/app/components/Icons/OutlineIcon.tsx -@@ -22,7 +22,7 @@ export default function OutlineIcon({ - viewBox={cover ? "2 2 20 20" : "0 0 24 24"} - version="1.1" - > -- -+ - - ); - } \ No newline at end of file