diff --git a/Scripts/Common/Functions.sh b/Scripts/Common/Functions.sh index a71b9e62..7667b43e 100644 --- a/Scripts/Common/Functions.sh +++ b/Scripts/Common/Functions.sh @@ -30,14 +30,20 @@ export -f startPatcher; enter() { echo "================================================================================================" dir="$1"; - cd "$DOS_BUILD_BASE$dir"; - echo "[ENTERING] $dir"; + dirReal="$DOS_BUILD_BASE$dir"; + if [ -d "$dirReal" ]; then + cd "$dirReal"; + echo -e "\e[0;32m[ENTERING] $dir\e[0m"; + return 0; + else + echo -e "\e[0;31m[ENTERING FAILED] $dir\e[0m"; + return 1; + fi; } export -f enter; enterAndClear() { - enter "$1"; - gitReset; + if enter "$1"; then gitReset; fi; } export -f enterAndClear; diff --git a/Scripts/LineageOS-14.1/Optimize.sh b/Scripts/Common/Optimize.sh similarity index 100% rename from Scripts/LineageOS-14.1/Optimize.sh rename to Scripts/Common/Optimize.sh diff --git a/Scripts/LineageOS-14.1/Overclock.sh b/Scripts/Common/Overclock.sh similarity index 85% rename from Scripts/LineageOS-14.1/Overclock.sh rename to Scripts/Common/Overclock.sh index 71823f51..9e03ff77 100644 --- a/Scripts/LineageOS-14.1/Overclock.sh +++ b/Scripts/Common/Overclock.sh @@ -20,32 +20,37 @@ echo "Applying overclocks..."; -enter "kernel/amazon/hdx-common"; +if enter "kernel/amazon/hdx-common"; then patch -p1 < "$DOS_PATCHES_OVERCLOCKS/android_kernel_amazon_hdx-common/0001-Overclock.patch"; #300MHz -> 268MHz, 2.26GHz -> 2.41GHz =+0.60GHz patch -p1 < "$DOS_PATCHES_OVERCLOCKS/android_kernel_amazon_hdx-common/0002-Overclock.patch"; patch -p1 < "$DOS_PATCHES_OVERCLOCKS/android_kernel_amazon_hdx-common/0003-Overclock.patch"; patch -p1 < "$DOS_PATCHES_OVERCLOCKS/android_kernel_amazon_hdx-common/0004-Overclock.patch"; +fi; -#enter "kernel/asus/grouper"; +#if enter "kernel/asus/grouper"; then #patch -p1 < "$DOS_PATCHES_OVERCLOCKS/android_kernel_asus_grouper/0001-Overclock.patch"; #echo "CONFIG_TEGRA_CPU_OVERCLOCK=y" >> arch/arm/configs/grouper_defconfig; #1.30GHz -> 1.50GHz =+0.80GHz #echo "CONFIG_TEGRA_CPU_OVERCLOCK_ULTIMATE=y" >> arch/arm/configs/grouper_defconfig; #1.30GHz -> 1.60GHz =+1.20GHz #echo "CONFIG_TEGRA_GPU_OVERCLOCK=y" >> arch/arm/configs/grouper_defconfig; #416MHz 520MHz #echo "CONFIG_TEGRA_GAMING_FIX=y" >> arch/arm/configs/grouper_defconfig; +#fi; -enter "kernel/huawei/angler"; +if enter "kernel/huawei/angler"; then patch -p1 < "$DOS_PATCHES_OVERCLOCKS/android_kernel_huawei_angler/0001-Overclock.patch"; +fi; -enter "kernel/lge/g3"; +if enter "kernel/lge/g3"; then patch -p1 < "$DOS_PATCHES_OVERCLOCKS/android_kernel_lge_g3/0001-Overclock.patch"; #2.45GHz -> 2.76GHz =+1.24GHz patch -p1 < "$DOS_PATCHES_OVERCLOCKS/android_kernel_lge_g3/0002-Overclock.patch"; patch -p1 < "$DOS_PATCHES_OVERCLOCKS/android_kernel_lge_g3/0003-Overclock.patch"; patch -p1 < "$DOS_PATCHES_OVERCLOCKS/android_kernel_lge_g3/0004-Overclock.patch"; +fi; -enter "kernel/lge/hammerhead"; +if enter "kernel/lge/hammerhead"; then patch -p1 < "$DOS_PATCHES_OVERCLOCKS/android_kernel_lge_hammerhead/0001-Overclock.patch"; #2.26GHz -> 2.95GHz =+2.76GHz XXX: Untested! +fi; -enter "kernel/lge/mako"; +if enter "kernel/lge/mako"; then patch -p1 < "$DOS_PATCHES_OVERCLOCKS/android_kernel_lge_mako/0001-Overclock.patch"; patch -p1 < "$DOS_PATCHES_OVERCLOCKS/android_kernel_lge_mako/0002-Overclock.patch"; patch -p1 < "$DOS_PATCHES_OVERCLOCKS/android_kernel_lge_mako/0003-Overclock.patch"; @@ -54,12 +59,19 @@ patch -p1 < "$DOS_PATCHES_OVERCLOCKS/android_kernel_lge_mako/0005-Overclock.patc echo "CONFIG_LOW_CPUCLOCKS=y" >> arch/arm/configs/lineageos_mako_defconfig; #384MHz -> 81MHz echo "CONFIG_CPU_OVERCLOCK=y" >> arch/arm/configs/lineageos_mako_defconfig; #1.51GHz -> 1.70GHz =+0.90GHz #echo "CPU_OVERCLOCK_ULTRA=y" >> arch/arm/configs/lineageos_mako_defconfig; #1.51GHz -> 1.94GHz =+1.72GHz XXX: Causes excessive throttling +fi; -enter "kernel/motorola/msm8916"; +if enter "kernel/motorola/msm8916"; then patch -p1 < "$DOS_PATCHES_OVERCLOCKS/android_kernel_motorola_msm8916/0001-Overclock.patch"; #1.36GHz -> 1.88GHz =+ 2.07GHz +fi; -enter "kernel/oneplus/msm8974"; +if enter "kernel/oneplus/msm8974"; then patch -p1 < "$DOS_PATCHES_OVERCLOCKS/android_kernel_oppo_msm8974/0001-OverUnderClock-EXTREME.patch"; #300MHz -> 268MHz, 2.45GHz -> 2.95GHz =+2.02GHz XXX: Not 100% stable under intense workloads +fi; + +if enter "kernel/oppo/msm8974"; then +patch -p1 < "$DOS_PATCHES_OVERCLOCKS/android_kernel_oppo_msm8974/0001-OverUnderClock-EXTREME.patch"; #300MHz -> 268MHz, 2.45GHz -> 2.95GHz =+2.02GHz XXX: Not 100% stable under intense workloads +fi; cd "$DOS_BUILD_BASE"; echo "Overclocks applied!"; diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh index 346c7521..b1f1e6d0 100644 --- a/Scripts/LineageOS-14.1/Functions.sh +++ b/Scripts/LineageOS-14.1/Functions.sh @@ -101,10 +101,10 @@ patchWorkspace() { source "$DOS_SCRIPTS/Patch.sh"; source "$DOS_SCRIPTS/Defaults.sh"; - if [ "$DOS_OVERCLOCKS_ENABLED" = true ]; then source "$DOS_SCRIPTS/Overclock.sh"; fi; - source "$DOS_SCRIPTS/Optimize.sh"; source "$DOS_SCRIPTS/Rebrand.sh"; source "$DOS_SCRIPTS/Theme.sh"; + if [ "$DOS_OVERCLOCKS_ENABLED" = true ]; then source "$DOS_SCRIPTS_COMMON/Overclock.sh"; fi; + source "$DOS_SCRIPTS_COMMON/Optimize.sh"; source "$DOS_SCRIPTS_COMMON/Deblob.sh"; source "$DOS_SCRIPTS_COMMON/Patch_CVE.sh"; source build/envsetup.sh; diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh index 3a0a3f06..9c42f3b8 100644 --- a/Scripts/LineageOS-15.1/Functions.sh +++ b/Scripts/LineageOS-15.1/Functions.sh @@ -91,9 +91,9 @@ patchWorkspace() { source "$DOS_SCRIPTS/Patch.sh"; source "$DOS_SCRIPTS/Defaults.sh"; - if [ "$DOS_OVERCLOCKS_ENABLED" = true ]; then source "$DOS_SCRIPTS/Overclock.sh"; fi; - source "$DOS_SCRIPTS/Optimize.sh"; source "$DOS_SCRIPTS/Rebrand.sh"; + if [ "$DOS_OVERCLOCKS_ENABLED" = true ]; then source "$DOS_SCRIPTS_COMMON/Overclock.sh"; fi; + source "$DOS_SCRIPTS_COMMON/Optimize.sh"; source "$DOS_SCRIPTS_COMMON/Deblob.sh"; source "$DOS_SCRIPTS_COMMON/Patch_CVE.sh"; source build/envsetup.sh; diff --git a/Scripts/LineageOS-15.1/Optimize.sh b/Scripts/LineageOS-15.1/Optimize.sh deleted file mode 100644 index 6694cbd1..00000000 --- a/Scripts/LineageOS-15.1/Optimize.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash -#DivestOS: A privacy oriented Android distribution -#Copyright (c) 2017-2018 Divested Computing, Inc. -# -#This program is free software: you can redistribute it and/or modify -#it under the terms of the GNU General Public License as published by -#the Free Software Foundation, either version 3 of the License, or -#(at your option) any later version. -# -#This program is distributed in the hope that it will be useful, -#but WITHOUT ANY WARRANTY; without even the implied warranty of -#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -#GNU General Public License for more details. -# -#You should have received a copy of the GNU General Public License -#along with this program. If not, see . - -#Attempts to increase performance and battery life -#Last verified: 2018-04-27 - -echo "Optimizing..."; - -enter "frameworks/base"; -sed -i 's/ScaleSetting = 1.0f;/ScaleSetting = 0.5f;/' services/core/java/com/android/server/wm/WindowManagerService.java; #TODO: Fix transition scale -#sed -i 's|||' - -enter "kernel" -sed -i "s/#define VM_MAX_READAHEAD\t128/#define VM_MAX_READAHEAD\t512/" ./*/*/include/linux/mm.h; #Lee Susman : Change the VM_MAX_READAHEAD value from the default 128KB to 512KB. This will allow the readahead window to grow to a maximum size of 512KB, which greatly benefits to sequential read throughput. - -cd "$DOS_BUILD_BASE"; -echo "Optimizing complete!"; diff --git a/Scripts/LineageOS-15.1/Overclock.sh b/Scripts/LineageOS-15.1/Overclock.sh deleted file mode 100644 index dcec93ea..00000000 --- a/Scripts/LineageOS-15.1/Overclock.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash -#DivestOS: A privacy oriented Android distribution -#Copyright (c) 2017-2018 Divested Computing, Inc. -# -#This program is free software: you can redistribute it and/or modify -#it under the terms of the GNU General Public License as published by -#the Free Software Foundation, either version 3 of the License, or -#(at your option) any later version. -# -#This program is distributed in the hope that it will be useful, -#but WITHOUT ANY WARRANTY; without even the implied warranty of -#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -#GNU General Public License for more details. -# -#You should have received a copy of the GNU General Public License -#along with this program. If not, see . - -#Overclocks the CPU to increase performance -#Last verified: 2018-04-27 - -echo "Applying overclocks..."; - -enter "kernel/huawei/angler"; -patch -p1 < "$DOS_PATCHES_OVERCLOCKS/android_kernel_huawei_angler/0001-Overclock.patch"; - -enter "kernel/lge/g3"; -patch -p1 < "$DOS_PATCHES_OVERCLOCKS/android_kernel_lge_g3/0001-Overclock.patch"; #2.45GHz -> 2.76GHz =+1.24GHz -patch -p1 < "$DOS_PATCHES_OVERCLOCKS/android_kernel_lge_g3/0002-Overclock.patch"; -patch -p1 < "$DOS_PATCHES_OVERCLOCKS/android_kernel_lge_g3/0003-Overclock.patch"; -patch -p1 < "$DOS_PATCHES_OVERCLOCKS/android_kernel_lge_g3/0004-Overclock.patch"; - -enter "kernel/lge/hammerhead"; -patch -p1 < "$DOS_PATCHES_OVERCLOCKS/android_kernel_lge_hammerhead/0001-Overclock.patch"; #2.26GHz -> 2.95GHz =+2.76GHz XXX: Untested! - -enter "kernel/lge/mako"; -patch -p1 < "$DOS_PATCHES_OVERCLOCKS/android_kernel_lge_mako/0001-Overclock.patch"; -patch -p1 < "$DOS_PATCHES_OVERCLOCKS/android_kernel_lge_mako/0002-Overclock.patch"; -patch -p1 < "$DOS_PATCHES_OVERCLOCKS/android_kernel_lge_mako/0003-Overclock.patch"; -patch -p1 < "$DOS_PATCHES_OVERCLOCKS/android_kernel_lge_mako/0004-Overclock.patch"; -patch -p1 < "$DOS_PATCHES_OVERCLOCKS/android_kernel_lge_mako/0005-Overclock.patch"; -echo "CONFIG_LOW_CPUCLOCKS=y" >> arch/arm/configs/lineageos_mako_defconfig; #384MHz -> 81MHz -echo "CONFIG_CPU_OVERCLOCK=y" >> arch/arm/configs/lineageos_mako_defconfig; #1.51GHz -> 1.70GHz =+0.90GHz -#echo "CPU_OVERCLOCK_ULTRA=y" >> arch/arm/configs/lineageos_mako_defconfig; #1.51GHz -> 1.94GHz =+1.72GHz XXX: Causes excessive throttling - -enter "kernel/oppo/msm8974"; -patch -p1 < "$DOS_PATCHES_OVERCLOCKS/android_kernel_oppo_msm8974/0001-OverUnderClock-EXTREME.patch"; #300MHz -> 268MHz, 2.45GHz -> 2.95GHz =+2.02GHz XXX: Not 100% stable under intense workloads - -cd "$DOS_BUILD_BASE"; -echo "Overclocks applied!";