NikGapps 3.61__py3-none-any.whl → 3.63__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- NikGapps/build/NikGappsManager.py +6 -0
- NikGapps/helper/Assets.py +1 -1
- NikGapps/helper/assets/changelogs.yaml +8 -0
- NikGapps/helper/assets/customize.sh +1 -0
- NikGapps/helper/assets/installer.sh +2 -0
- NikGapps/helper/assets/nikgapps_functions.sh +143 -108
- NikGapps/helper/compression/Export.py +10 -5
- {nikgapps-3.61.dist-info → nikgapps-3.63.dist-info}/METADATA +1 -1
- {nikgapps-3.61.dist-info → nikgapps-3.63.dist-info}/RECORD +13 -13
- {nikgapps-3.61.dist-info → nikgapps-3.63.dist-info}/WHEEL +1 -1
- {nikgapps-3.61.dist-info → nikgapps-3.63.dist-info}/entry_points.txt +0 -0
- {nikgapps-3.61.dist-info → nikgapps-3.63.dist-info}/licenses/LICENSE +0 -0
- {nikgapps-3.61.dist-info → nikgapps-3.63.dist-info}/top_level.txt +0 -0
|
@@ -396,6 +396,9 @@ class NikGappsManager:
|
|
|
396
396
|
if float(self.android_version) < 12:
|
|
397
397
|
setup_wizard_packages.append("AndroidMigratePrebuilt")
|
|
398
398
|
setup_wizard = self.create_appset_list_from_packages(setup_wizard_packages, fallback_appset="SetupWizard")
|
|
399
|
+
for sw_appset in setup_wizard:
|
|
400
|
+
for package in sw_appset.package_list:
|
|
401
|
+
package.addon_index = "07"
|
|
399
402
|
omni_packages = [
|
|
400
403
|
"GoogleCalculator",
|
|
401
404
|
"Drive",
|
|
@@ -500,6 +503,9 @@ class NikGappsManager:
|
|
|
500
503
|
if float(self.android_version) < 12:
|
|
501
504
|
pixel_setup_wizard_packages.append("AndroidMigratePixelPrebuilt")
|
|
502
505
|
pixel_setup_wizard = self.create_appset_list_from_packages(pixel_setup_wizard_packages, keyword="Pixel")
|
|
506
|
+
for sw_appset in pixel_setup_wizard:
|
|
507
|
+
for package in sw_appset.package_list:
|
|
508
|
+
package.addon_index = "07"
|
|
503
509
|
addon_set_list = pixel_setup_wizard + self.create_appset_list_from_packages(addon_packages)
|
|
504
510
|
if addon_name:
|
|
505
511
|
return [app_set for app_set in addon_set_list if app_set.title == addon_name]
|
NikGapps/helper/Assets.py
CHANGED
|
@@ -9,7 +9,7 @@ from niklibrary.json.Json import Json
|
|
|
9
9
|
|
|
10
10
|
|
|
11
11
|
class Assets:
|
|
12
|
-
assets_folder = str(resources.files('
|
|
12
|
+
assets_folder = str(resources.files('NikGapps.helper').joinpath('assets'))
|
|
13
13
|
if not F.dir_exists(assets_folder):
|
|
14
14
|
assets_folder = os.path.join(os.getcwd(), 'assets')
|
|
15
15
|
if not F.dir_exists(assets_folder):
|
|
@@ -1,3 +1,11 @@
|
|
|
1
|
+
- date: 11th June 2025 (Android 14-15)
|
|
2
|
+
changes:
|
|
3
|
+
- item: Updated google apps to make them QPR2 compatible
|
|
4
|
+
- item: Enhanced the installer script to display space information
|
|
5
|
+
- item: Fixed the issue where the space calculation was not accurate
|
|
6
|
+
- item: Fixed the issue where uninstalling exclusive system files was not working
|
|
7
|
+
- item: Fixed the issue where use_zip_config was not recognized during sideloading
|
|
8
|
+
- item: Prioritize Installing Setup Wizard after Core (more stability when it comes to installation)
|
|
1
9
|
- date: 27th Jan 2025 (Android 14-15)
|
|
2
10
|
changes:
|
|
3
11
|
- item: Fixed Issues with some apps not showing up in Private space
|
|
@@ -110,7 +110,7 @@ calculate_space() {
|
|
|
110
110
|
if ! is_mounted "/$partition"; then
|
|
111
111
|
continue
|
|
112
112
|
fi
|
|
113
|
-
addToLog "
|
|
113
|
+
addToLog "---> Calculating space in /$partition"
|
|
114
114
|
# Read and save system partition size details
|
|
115
115
|
df=$(df -k /"$partition" | tail -n 1)
|
|
116
116
|
addToLog "$df"
|
|
@@ -227,7 +227,6 @@ delete_prop_lines() {
|
|
|
227
227
|
[ -f "$file_path" ] && sed -i '/^buildprop=/d' "$file_path"
|
|
228
228
|
}
|
|
229
229
|
|
|
230
|
-
|
|
231
230
|
get_prop_file_path() {
|
|
232
231
|
propFilePath=""
|
|
233
232
|
for i in $(find /system/etc/permissions -iname "$1.prop" 2>/dev/null;); do
|
|
@@ -252,8 +251,8 @@ get_available_partition_size(){
|
|
|
252
251
|
addToLog "- $1 not mounted!" "$log_file_name"
|
|
253
252
|
continue
|
|
254
253
|
fi
|
|
255
|
-
addToLog "--> Calculating space in
|
|
256
|
-
df=$(df -k
|
|
254
|
+
addToLog "--> Calculating space in $partition" "$log_file_name"
|
|
255
|
+
df=$(df -k "$partition" | tail -n 1)
|
|
257
256
|
addToLog "$df"
|
|
258
257
|
case $df in
|
|
259
258
|
/dev/block/*) df=$(echo "$df" | $BB awk '{ print substr($0, index($0,$2)) }') ;;
|
|
@@ -529,6 +528,7 @@ find_config() {
|
|
|
529
528
|
unpack "afzc/nikgapps.config" "$COMMONDIR/nikgapps.config"
|
|
530
529
|
unpack "afzc/debloater.config" "$COMMONDIR/debloater.config"
|
|
531
530
|
use_zip_config=$(ReadConfigValue "UseZipConfig" "$COMMONDIR/nikgapps.config")
|
|
531
|
+
[ -z "$use_zip_config" ] && use_zip_config=$(ReadConfigValue "use_zip_config" "$COMMONDIR/nikgapps.config")
|
|
532
532
|
addToLog "- UseZipConfig=$use_zip_config"
|
|
533
533
|
if [ "$use_zip_config" = "1" ]; then
|
|
534
534
|
ui_print "- Using config file from the zip"
|
|
@@ -639,7 +639,8 @@ find_install_mode() {
|
|
|
639
639
|
fi
|
|
640
640
|
fi
|
|
641
641
|
addToLog "----------------------------------------------------------------------------" "$package_title"
|
|
642
|
-
ui_print "
|
|
642
|
+
ui_print " Installing..." "$package_logDir/$current_package_title.log"
|
|
643
|
+
ui_print " "
|
|
643
644
|
install_package
|
|
644
645
|
delete_recursive "$pkgFile"
|
|
645
646
|
delete_recursive "$TMPDIR/$pkgContent"
|
|
@@ -964,6 +965,23 @@ get_install_partition(){
|
|
|
964
965
|
echo "$install_partition"
|
|
965
966
|
}
|
|
966
967
|
|
|
968
|
+
get_install_partition_from_config() {
|
|
969
|
+
case "$install_partition_val" in
|
|
970
|
+
"default")
|
|
971
|
+
# check if the package is already installed before and we are flashing it again
|
|
972
|
+
# we want to keep the partition as it is and not move it to another partition because of space constraints while reflashing or otherwise
|
|
973
|
+
install_partition_value=$(get_installed_partition "$1")
|
|
974
|
+
[ -z "$install_partition_value" ] && addToLog "- $1 is not installed before" "$1"
|
|
975
|
+
;;
|
|
976
|
+
"system") install_partition_value=$system ;;
|
|
977
|
+
"product") install_partition_value=$product ;;
|
|
978
|
+
"system_ext") install_partition_value=$system_ext ;;
|
|
979
|
+
"data") install_partition_value="/data/extra" ;;
|
|
980
|
+
/*) install_partition_value=$install_partition_val ;;
|
|
981
|
+
esac
|
|
982
|
+
echo $install_partition_value
|
|
983
|
+
}
|
|
984
|
+
|
|
967
985
|
get_package_progress(){
|
|
968
986
|
for i in $ProgressBarValues; do
|
|
969
987
|
if [ $(echo $i | cut -d'=' -f1) = "$1" ]; then
|
|
@@ -1002,121 +1020,117 @@ get_total_available_size(){
|
|
|
1002
1020
|
echo "$total_available_size"
|
|
1003
1021
|
}
|
|
1004
1022
|
|
|
1005
|
-
install_app_set()
|
|
1023
|
+
install_app_set(){
|
|
1006
1024
|
appset_name="$1"
|
|
1007
1025
|
packages_in_appset="$2"
|
|
1008
1026
|
extn="$3"
|
|
1009
|
-
|
|
1010
|
-
value=1
|
|
1011
|
-
if [ -f "$nikgapps_config_file_name" ]; then
|
|
1012
|
-
value=$(ReadConfigValue "$appset_name" "$nikgapps_config_file_name")
|
|
1013
|
-
if [ "$value" = "" ]; then
|
|
1014
|
-
value=1
|
|
1015
|
-
fi
|
|
1016
|
-
fi
|
|
1027
|
+
value=$(read_from_nikgapps_config "$appset_name" "1")
|
|
1017
1028
|
addToLog "- Current Appset=$appset_name, value=$value"
|
|
1029
|
+
|
|
1018
1030
|
case "$value" in
|
|
1019
1031
|
"0")
|
|
1020
1032
|
ui_print "x Skipping $appset_name"
|
|
1033
|
+
return
|
|
1021
1034
|
;;
|
|
1022
1035
|
"-1")
|
|
1023
1036
|
addToLog "- $appset_name is disabled"
|
|
1024
|
-
|
|
1025
|
-
|
|
1026
|
-
|
|
1037
|
+
uninstall_appset $appset_name $packages_in_appset $extn
|
|
1038
|
+
return
|
|
1039
|
+
;;
|
|
1040
|
+
esac
|
|
1041
|
+
case "$mode" in
|
|
1042
|
+
"install")
|
|
1043
|
+
addToLog "- Install Mode On"
|
|
1044
|
+
;;
|
|
1045
|
+
"uninstall_by_name")
|
|
1046
|
+
uninstall_appset $appset_name $packages_in_appset $extn
|
|
1047
|
+
return
|
|
1048
|
+
;;
|
|
1049
|
+
"uninstall")
|
|
1050
|
+
for k in $packages_in_appset; do
|
|
1051
|
+
current_package_title=$(echo "$k" | cut -d',' -f1)
|
|
1052
|
+
value=$(read_from_nikgapps_config "$current_package_title" "1")
|
|
1053
|
+
[ "$value" -eq -1 ] && uninstall_the_package "$appset_name" "$current_package_title" "$extn" "1"
|
|
1027
1054
|
done
|
|
1055
|
+
return
|
|
1028
1056
|
;;
|
|
1029
1057
|
*)
|
|
1030
|
-
|
|
1031
|
-
|
|
1032
|
-
for k in $packages_in_appset; do
|
|
1033
|
-
current_package_title=$(echo "$k" | cut -d',' -f1)
|
|
1034
|
-
uninstall_the_package "$appset_name" "$current_package_title" "$extn" "1"
|
|
1035
|
-
done
|
|
1036
|
-
;;
|
|
1037
|
-
"uninstall")
|
|
1038
|
-
for k in $packages_in_appset; do
|
|
1039
|
-
current_package_title=$(echo "$k" | cut -d',' -f1)
|
|
1040
|
-
[ -z "$value" ] && value=$(ReadConfigValue "$current_package_title" "$nikgapps_config_file_name")
|
|
1041
|
-
[ -z "$value" ] && value=1
|
|
1042
|
-
[ "$value" -eq -1 ] && uninstall_the_package "$appset_name" "$current_package_title" "$extn" "1"
|
|
1043
|
-
done
|
|
1044
|
-
;;
|
|
1045
|
-
"install")
|
|
1046
|
-
for i in $packages_in_appset; do
|
|
1047
|
-
current_package_title=$(echo "$i" | cut -d',' -f1)
|
|
1048
|
-
addToLog "----------------------------------------------------------------------------" "$current_package_title"
|
|
1049
|
-
addToLog "----------------------------------------------------------------------------"
|
|
1050
|
-
addToLog "- Working for $current_package_title" "$current_package_title"
|
|
1051
|
-
addToLog "- Working for $current_package_title"
|
|
1052
|
-
value=$(ReadConfigValue ">>$current_package_title" "$nikgapps_config_file_name")
|
|
1053
|
-
[ -z "$value" ] && value=$(ReadConfigValue "$current_package_title" "$nikgapps_config_file_name")
|
|
1054
|
-
[ -z "$value" ] && value=1
|
|
1055
|
-
if [ "$value" -ge 1 ]; then
|
|
1056
|
-
package_size=$(echo "$i" | cut -d',' -f2)
|
|
1057
|
-
addToLog "- package_size = $package_size" "$current_package_title"
|
|
1058
|
-
default_partition=$(echo "$i" | cut -d',' -f3)
|
|
1059
|
-
addToLog "- default_partition = $default_partition" "$current_package_title"
|
|
1060
|
-
case "$default_partition" in
|
|
1061
|
-
"system_ext")
|
|
1062
|
-
[ $androidVersion -le 10 ] && default_partition=$product && addToLog "- default_partition is overridden" "$current_package_title"
|
|
1063
|
-
;;
|
|
1064
|
-
esac
|
|
1065
|
-
addToLog "----------------------------------------------------------------------------" "$current_package_title"
|
|
1066
|
-
addToLog "- InstallPartition is $install_partition_val" "$current_package_title"
|
|
1067
|
-
case "$install_partition_val" in
|
|
1068
|
-
"default")
|
|
1069
|
-
install_partition=$(get_installed_partition "$current_package_title")
|
|
1070
|
-
[ -z "$install_partition" ] && addToLog "- $current_package_title is not installed before" "$current_package_title"
|
|
1071
|
-
;;
|
|
1072
|
-
"system") install_partition=$system ;;
|
|
1073
|
-
"product") install_partition=$product ;;
|
|
1074
|
-
"system_ext") install_partition=$system_ext ;;
|
|
1075
|
-
"data") install_partition="/data/extra" ;;
|
|
1076
|
-
/*) install_partition=$install_partition_val ;;
|
|
1077
|
-
esac
|
|
1078
|
-
if [ -z "$install_partition" ]; then
|
|
1079
|
-
install_partition=$(get_install_partition "$default_partition" "$default_partition" "$package_size" "$current_package_title")
|
|
1080
|
-
else
|
|
1081
|
-
size_partition=$(echo "$install_partition" | awk -F'/' '{print "/"$2}')
|
|
1082
|
-
addToLog "- size_partition=$size_partition" "$current_package_title"
|
|
1083
|
-
available_size=$(get_available_partition_size "$size_partition" "$pkg_name")
|
|
1084
|
-
addToLog "- available_size=$available_size and package_size=$package_size" "$current_package_title"
|
|
1085
|
-
if [ "$available_size" -lt "$package_size" ]; then
|
|
1086
|
-
addToLog "- there is not enough space" "$current_package_title"
|
|
1087
|
-
install_partition=-1
|
|
1088
|
-
fi
|
|
1089
|
-
fi
|
|
1090
|
-
if [ "$install_partition" = "-1" ]; then
|
|
1091
|
-
addToLog "- Storage is full, uninstalling to free up space for $current_package_title" "$current_package_title"
|
|
1092
|
-
uninstall_the_package "$appset_name" "$current_package_title" "$extn" "0"
|
|
1093
|
-
addToLog "----------------------------------------------------------------------------" "$current_package_title"
|
|
1094
|
-
install_partition=$(get_install_partition "$default_partition" "$default_partition" "$package_size" "$current_package_title")
|
|
1095
|
-
fi
|
|
1096
|
-
addToLog "- $current_package_title required size: $package_size Kb, installing to $install_partition ($default_partition)" "$current_package_title"
|
|
1097
|
-
if [ "$install_partition" != "-1" ]; then
|
|
1098
|
-
size_before=$(calculate_space_before "$current_package_title" "$install_partition")
|
|
1099
|
-
install_the_package "$appset_name" "$i" "$current_package_title" "$value" "$install_partition" "$extn"
|
|
1100
|
-
size_after=$(calculate_space_after "$current_package_title" "$install_partition" "$size_before" "$package_size")
|
|
1101
|
-
else
|
|
1102
|
-
ui_print "x Skipping $current_package_title as no space is left" "$package_logDir/$current_package_title.log"
|
|
1103
|
-
addToLog "x Skipping $current_package_title as no space is left"
|
|
1104
|
-
fi
|
|
1105
|
-
elif [ "$value" -eq -1 ] ; then
|
|
1106
|
-
addToLog "- uninstalling $current_package_title" "$current_package_title"
|
|
1107
|
-
uninstall_the_package "$appset_name" "$current_package_title" "$extn" "1"
|
|
1108
|
-
elif [ "$value" -eq 0 ] ; then
|
|
1109
|
-
ui_print "x Skipping $current_package_title" "$package_logDir/$current_package_title.log"
|
|
1110
|
-
addToLog "x Skipping $current_package_title"
|
|
1111
|
-
fi
|
|
1112
|
-
done
|
|
1113
|
-
;;
|
|
1114
|
-
*)
|
|
1115
|
-
addToLog "- Invalid mode $mode"
|
|
1116
|
-
;;
|
|
1117
|
-
esac
|
|
1058
|
+
addToLog "- Invalid mode $mode"
|
|
1059
|
+
return
|
|
1118
1060
|
;;
|
|
1119
1061
|
esac
|
|
1062
|
+
|
|
1063
|
+
pkg_count=$(echo "$packages_in_appset" | wc -w)
|
|
1064
|
+
if [ "$pkg_count" -gt 1 ]; then
|
|
1065
|
+
ui_print " > Working on $appset_name"
|
|
1066
|
+
fi
|
|
1067
|
+
|
|
1068
|
+
for i in $packages_in_appset; do
|
|
1069
|
+
current_package_title=$(echo "$i" | cut -d',' -f1)
|
|
1070
|
+
value=$(read_from_nikgapps_config ">>$current_package_title" "")
|
|
1071
|
+
[ -z "$value" ] && value=$(read_from_nikgapps_config "$current_package_title" "1")
|
|
1072
|
+
if [ "$value" -ge 1 ]; then
|
|
1073
|
+
package_size=$(echo "$i" | cut -d',' -f2)
|
|
1074
|
+
default_partition=$(echo "$i" | cut -d',' -f3)
|
|
1075
|
+
addToLog "- package_size = $package_size" "$current_package_title"
|
|
1076
|
+
addToLog "- default_partition = $default_partition" "$current_package_title"
|
|
1077
|
+
ui_print " > $current_package_title" "$package_logDir/$current_package_title.log"
|
|
1078
|
+
ui_print " Required size: $package_size KB" "$package_logDir/$current_package_title.log"
|
|
1079
|
+
[ "$default_partition" = "system_ext" ] && [ $androidVersion -le 10 ] && default_partition=$product && addToLog "- default_partition is overridden" "$current_package_title"
|
|
1080
|
+
# this will read the config to identify if partition is overridden or the package is already installed
|
|
1081
|
+
install_partition=$(get_install_partition_from_config "$current_package_title")
|
|
1082
|
+
# if the install_partition is blank, it means, it is a fresh install on default configuration
|
|
1083
|
+
if [ -z "$install_partition" ]; then
|
|
1084
|
+
# for fresh install, loop through the partitions to determine the partition where we can install current package
|
|
1085
|
+
install_partition=$(get_install_partition "$default_partition" "$default_partition" "$package_size" "$current_package_title")
|
|
1086
|
+
else
|
|
1087
|
+
# for re-flash, find the size of the partition to see if there is enough space
|
|
1088
|
+
size_partition=$(echo "$install_partition" | awk -F'/' '{print "/"$2}')
|
|
1089
|
+
available_size=$(get_available_partition_size "$size_partition" "$pkg_name")
|
|
1090
|
+
ui_print " Package Exists: Re-installing..." "$package_logDir/$current_package_title.log"
|
|
1091
|
+
addToLog "- size_partition=$size_partition" "$current_package_title"
|
|
1092
|
+
addToLog "- available_size=$available_size and package_size=$package_size" "$current_package_title"
|
|
1093
|
+
# if there is not enough space, we need to try uninstalling once as we might be re-installing older version
|
|
1094
|
+
# with smaller apk size, so uninstalling will make enough space to re-install
|
|
1095
|
+
if [ "$available_size" -lt "$package_size" ]; then
|
|
1096
|
+
addToLog "- there is not enough space" "$current_package_title"
|
|
1097
|
+
ui_print " x Not enough space ($available_size KB) to re-install" "$package_logDir/$current_package_title.log"
|
|
1098
|
+
install_partition=-1
|
|
1099
|
+
fi
|
|
1100
|
+
# install_partition=-1 indicates, we need to uninstall the package to make space for re-install
|
|
1101
|
+
# re-install can be at a new partition so we need to find the partition again
|
|
1102
|
+
if [ "$install_partition" = "-1" ]; then
|
|
1103
|
+
addToLog "- Storage is full, uninstalling to free up space for $current_package_title" "$current_package_title"
|
|
1104
|
+
ui_print " ! Uninstalling to make space" "$package_logDir/$current_package_title.log"
|
|
1105
|
+
uninstall_the_package "$appset_name" "$current_package_title" "$extn" "0"
|
|
1106
|
+
addToLog "----------------------------------------------------------------------------" "$current_package_title"
|
|
1107
|
+
install_partition=$(get_install_partition "$default_partition" "$default_partition" "$package_size" "$current_package_title")
|
|
1108
|
+
fi
|
|
1109
|
+
fi
|
|
1110
|
+
# if we have the install_partition ready, we can calculate the before and after space of the partition
|
|
1111
|
+
# we can also proceed ahead with installation as everything is acceptable now.
|
|
1112
|
+
if [ "$install_partition" != "-1" ]; then
|
|
1113
|
+
size_before=$(calculate_space_before "$current_package_title" "$install_partition")
|
|
1114
|
+
p=$(echo "$install_partition" | awk -F'/' '{print "/"$2}')
|
|
1115
|
+
ui_print " Partition: $p (Remaining: $size_before KB)" "$package_logDir/$current_package_title.log"
|
|
1116
|
+
install_the_package "$appset_name" "$i" "$current_package_title" "$value" "$install_partition" "$package_size" "$size_before" "$extn"
|
|
1117
|
+
size_after=$(calculate_space_after "$current_package_title" "$install_partition" "$size_before" "$package_size")
|
|
1118
|
+
else
|
|
1119
|
+
size_before=$(calculate_space_before "$current_package_title" "/system")
|
|
1120
|
+
ui_print " ! Remaining space now ($size_before KB)" "$package_logDir/$current_package_title.log"
|
|
1121
|
+
ui_print " x Skipping: No space left" "$package_logDir/$current_package_title.log"
|
|
1122
|
+
ui_print " "
|
|
1123
|
+
addToLog "x Skipping $current_package_title as no space is left"
|
|
1124
|
+
fi
|
|
1125
|
+
|
|
1126
|
+
elif [ "$value" -eq -1 ] ; then
|
|
1127
|
+
addToLog "- uninstalling $current_package_title" "$current_package_title"
|
|
1128
|
+
uninstall_the_package "$appset_name" "$current_package_title" "$extn" "1"
|
|
1129
|
+
elif [ "$value" -eq 0 ] ; then
|
|
1130
|
+
ui_print "x Skipping $current_package_title" "$package_logDir/$current_package_title.log"
|
|
1131
|
+
addToLog "x Skipping $current_package_title"
|
|
1132
|
+
fi
|
|
1133
|
+
done
|
|
1120
1134
|
}
|
|
1121
1135
|
|
|
1122
1136
|
install_the_package() {
|
|
@@ -1125,7 +1139,9 @@ install_the_package() {
|
|
|
1125
1139
|
package_name="$3"
|
|
1126
1140
|
config_value="$4"
|
|
1127
1141
|
install_partition="$5"
|
|
1128
|
-
|
|
1142
|
+
package_required_size="$6"
|
|
1143
|
+
partition_size="$7"
|
|
1144
|
+
[ -z "$8" ] && extn=".zip" || extn="$8"
|
|
1129
1145
|
addToLog "- Default Extn=$extn" "$package_name"
|
|
1130
1146
|
case "$extn" in
|
|
1131
1147
|
.*) ;;
|
|
@@ -1147,7 +1163,7 @@ install_the_package() {
|
|
|
1147
1163
|
esac
|
|
1148
1164
|
chmod 755 "$TMPDIR/$pkgContent/installer.sh"
|
|
1149
1165
|
# shellcheck source=src/installer.sh
|
|
1150
|
-
. "$TMPDIR/$pkgContent/installer.sh" "$config_value" "$nikgapps_config_file_name" "$install_partition"
|
|
1166
|
+
. "$TMPDIR/$pkgContent/installer.sh" "$config_value" "$nikgapps_config_file_name" "$install_partition" "$package_required_size" "$partition_size"
|
|
1151
1167
|
|
|
1152
1168
|
set_progress "$(get_package_progress "$package_name")"
|
|
1153
1169
|
}
|
|
@@ -1267,6 +1283,15 @@ ReadConfigValue() {
|
|
|
1267
1283
|
return $?
|
|
1268
1284
|
}
|
|
1269
1285
|
|
|
1286
|
+
read_from_nikgapps_config(){
|
|
1287
|
+
key=$1
|
|
1288
|
+
fallback_value=$2
|
|
1289
|
+
if [ -f "$nikgapps_config_file_name" ]; then
|
|
1290
|
+
value=$(ReadConfigValue "$key" "$nikgapps_config_file_name")
|
|
1291
|
+
fi
|
|
1292
|
+
[ -z $value ] && echo $fallback_value || echo $value
|
|
1293
|
+
}
|
|
1294
|
+
|
|
1270
1295
|
delete_overlays(){
|
|
1271
1296
|
overlays_deleted=""
|
|
1272
1297
|
addToLog "- Deleting Overlays"
|
|
@@ -1434,7 +1459,7 @@ uninstall_file() {
|
|
|
1434
1459
|
addToLog "- Uninstalling $1" "$2"
|
|
1435
1460
|
# $1 will start with ___ which needs to be skipped so replacing it with blank value
|
|
1436
1461
|
blank=""
|
|
1437
|
-
file_location=$(echo "$1" | sed
|
|
1462
|
+
file_location=$(echo "$1" | sed -e 's/^___system___//' -e 's/^___//' -e 's/___/\//g')
|
|
1438
1463
|
# For Devices having symlinked product and system_ext partition
|
|
1439
1464
|
for sys in "/system"; do
|
|
1440
1465
|
for subsys in "/system" "/product" "/system_ext"; do
|
|
@@ -1479,4 +1504,14 @@ uninstall_the_package() {
|
|
|
1479
1504
|
set_progress $(get_package_progress "$package_name")
|
|
1480
1505
|
delete_recursive "$pkgFile"
|
|
1481
1506
|
delete_recursive "$TMPDIR/$pkgContent"
|
|
1507
|
+
}
|
|
1508
|
+
|
|
1509
|
+
uninstall_appset(){
|
|
1510
|
+
# appset_name = $1
|
|
1511
|
+
# packages_in_appset = $2
|
|
1512
|
+
# extn = $3
|
|
1513
|
+
for i in $2; do
|
|
1514
|
+
current_package_title=$(echo "$i" | cut -d',' -f1)
|
|
1515
|
+
uninstall_the_package "$1" "$current_package_title" "$3" "1"
|
|
1516
|
+
done
|
|
1482
1517
|
}
|
|
@@ -129,15 +129,20 @@ class Export:
|
|
|
129
129
|
installer_script_path_string += "# Shell Script EDIFY Replacement\n\n"
|
|
130
130
|
core_app_sets = []
|
|
131
131
|
other_app_sets = []
|
|
132
|
+
setup_wizard_sets = []
|
|
132
133
|
for app_set in app_set_list:
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
134
|
+
match app_set.title:
|
|
135
|
+
case 'Core' | 'CoreGo':
|
|
136
|
+
core_app_sets.append(app_set)
|
|
137
|
+
case 'SetupWizard' | 'PixelSetupWizard':
|
|
138
|
+
setup_wizard_sets.append(app_set)
|
|
139
|
+
case _:
|
|
140
|
+
other_app_sets.append(app_set)
|
|
141
|
+
|
|
137
142
|
sorted_other_app_sets = sorted(other_app_sets,
|
|
138
143
|
key=lambda app__set: sum(int(pakg.pkg_size) for pakg in app__set.package_list),
|
|
139
144
|
reverse=True)
|
|
140
|
-
sorted_app_sets = core_app_sets + sorted_other_app_sets
|
|
145
|
+
sorted_app_sets = core_app_sets + setup_wizard_sets + sorted_other_app_sets
|
|
141
146
|
progress_max = 0.9
|
|
142
147
|
progress_per_package = 0
|
|
143
148
|
if total_packages > 0:
|
|
@@ -7,7 +7,7 @@ NikGapps/main.py,sha256=86OrjdjqZwfdzgrQte6e8ADzGgKms37YaM_QlbY3BlE,2904
|
|
|
7
7
|
NikGapps/overlay_control.py,sha256=3BVA8v5JeaFPqKbnjbrDE9qyxY12YTYAoH15r1thE-w,3097
|
|
8
8
|
NikGapps/test.py,sha256=M6fpDBtOpwHgR9bjAEhhjgGtAN9UuLEKZSU0HFX-xdE,84
|
|
9
9
|
NikGapps/build/Build.py,sha256=_-gEQD2vkci-dQOmiE-SCULiAGQ-LkyKWXhvCP61884,7621
|
|
10
|
-
NikGapps/build/NikGappsManager.py,sha256=
|
|
10
|
+
NikGapps/build/NikGappsManager.py,sha256=6X1lxme5gQyllCqciVqazoN7d2mqXq29mbdDZRagg0c,21908
|
|
11
11
|
NikGapps/build/NikGappsOverlays.py,sha256=bbAIuIeE7HICdXRNeZJrvuW58_tUuDH9Du_1k6QPkxg,569
|
|
12
12
|
NikGapps/build/PackageConstants.py,sha256=JUw1CLYY55JM8C7Ba9Kz5PqtW7vu-ZZjTP4W6v-7zbM,17867
|
|
13
13
|
NikGapps/build/Release.py,sha256=3YjZ2puzBE_QuaJMXQxRtphX0WGtU4SKYrGDD3RztL0,4944
|
|
@@ -16,32 +16,32 @@ NikGapps/config/NikGappsConfig.py,sha256=7qqeKyWm-2GO39Z8vSOI9TqEd22u0QHLetu2urQ
|
|
|
16
16
|
NikGapps/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
17
17
|
NikGapps/helper/AppSet.py,sha256=vEIwk7NX1LQt71UJ3naEdsekmB_Ea0v8j0CQJkrSTEU,352
|
|
18
18
|
NikGapps/helper/Args.py,sha256=r1KIKs1x9DbIPwqBPmfIb3BBD5PvclvUDIv3D-fvy2A,4338
|
|
19
|
-
NikGapps/helper/Assets.py,sha256=
|
|
19
|
+
NikGapps/helper/Assets.py,sha256=gEzdY8zc7sKQTIPQeBY0PmkyJuGwRWDwK6i5uL0g9-U,2253
|
|
20
20
|
NikGapps/helper/Config.py,sha256=x7s8wgaLjLpVmDsf9LZ_lNcAg98pnWnNgtb5mbgKbX8,2476
|
|
21
21
|
NikGapps/helper/ConfigObj.py,sha256=ep9--o1SPgGXkElrjkf7hjF96KGSrmcQ9oGCpicN7D4,462
|
|
22
22
|
NikGapps/helper/Package.py,sha256=P8BU3r_5t_6-Qs0WoTAt0rB64oVzqAE-NERItwYW1X4,9182
|
|
23
23
|
NikGapps/helper/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
24
24
|
NikGapps/helper/assets/addon.sh,sha256=qXwZ7GQVnOrkSNRcJTKycKRKkUa8kRA_iDwsKVDMHwY,9424
|
|
25
25
|
NikGapps/helper/assets/appsets.json,sha256=SWRhw0VXDQND_9obS69NYk58F4RFoMV4wCSQ4FPveYs,5739
|
|
26
|
-
NikGapps/helper/assets/changelogs.yaml,sha256=
|
|
26
|
+
NikGapps/helper/assets/changelogs.yaml,sha256=TJrAdwQncCN_080p54F6IgbDhZiR2hhESg_bzbFvTIw,50063
|
|
27
27
|
NikGapps/helper/assets/config_versions.json,sha256=-AT7NZVCpllI4cAHcy9oX7XQbvWvyiPYabT2OagrrXI,102
|
|
28
|
-
NikGapps/helper/assets/customize.sh,sha256=
|
|
28
|
+
NikGapps/helper/assets/customize.sh,sha256=w7xzVplO2us9cWafBlGj-3biMCvwttLwV1q40d63W50,10255
|
|
29
29
|
NikGapps/helper/assets/debloater.config,sha256=7Wx-WH93JSJHTYJCT5-y8TtPFFIzQgMKJcKJaf583bU,878
|
|
30
30
|
NikGapps/helper/assets/functions.sh,sha256=9jOHEM0cmkP0cMIj7KaNwXDOAG0WxOuIZganxu1YoFU,3859
|
|
31
31
|
NikGapps/helper/assets/gofile.sh,sha256=nfJdg6Acup2CCU-aqSR_no8TwE_sl2Vj9uUsUKR1HUM,312
|
|
32
32
|
NikGapps/helper/assets/header.sh,sha256=mAPz8aFdedVwkt35KoGQjv3vntH6trnfVbZwnDTA5Tc,481
|
|
33
|
-
NikGapps/helper/assets/installer.sh,sha256
|
|
33
|
+
NikGapps/helper/assets/installer.sh,sha256=2bjrrMfnpVFbE6Z67xzEPg2JqvKSLSc4iqnKx77n-3E,295
|
|
34
34
|
NikGapps/helper/assets/magisk-update-binary.sh,sha256=gUrrCqs1Mc-K9PAftiyHWvpod3Z6wP7GgyA9rd60Ikk,2082
|
|
35
35
|
NikGapps/helper/assets/module.prop,sha256=218gUx_RERtgAPXKID5dCgdGgYvxZuA11_MV4jG5YrQ,235
|
|
36
36
|
NikGapps/helper/assets/mount.sh,sha256=G_rAktQyrUQJpQlCpihbCwWrDCJ71zNEZJ3ZCARA7MQ,6018
|
|
37
37
|
NikGapps/helper/assets/mtg_mount.sh,sha256=M6oYs7aLmMRBJbIq8ANmHxGrTIf7Jxe0GLsPq3SdmJ0,2697
|
|
38
38
|
NikGapps/helper/assets/nikgapps.config,sha256=807lgmt0MhX2hx18ZgM7idj5ZwCgyHkKJ4VtSKOD3ew,1575
|
|
39
|
-
NikGapps/helper/assets/nikgapps_functions.sh,sha256=
|
|
39
|
+
NikGapps/helper/assets/nikgapps_functions.sh,sha256=FdJ6FQyEpFPBr5BsN25nT76z5SZBhhqXJh33nzOVXKY,58845
|
|
40
40
|
NikGapps/helper/assets/packages.json,sha256=IgJd9jYD1ej_86CwGsEoqQ9DqctVje5EKthVaFbnvsI,18457
|
|
41
41
|
NikGapps/helper/assets/uninstaller.sh,sha256=Lob89FNVfpHFkdzUJFDwVQwlnc7WB_U-U28Y4fZgycE,870
|
|
42
42
|
NikGapps/helper/assets/unmount.sh,sha256=L8Lq7ZVfwazXaZp5Jkuce2pCGJCLZh57uj_BzFSDb-c,1107
|
|
43
43
|
NikGapps/helper/compression/CompOps.py,sha256=RjYxtNh98xCds58oWxX8UGbe9g-WUYCriTRupWZqMZc,1823
|
|
44
|
-
NikGapps/helper/compression/Export.py,sha256=
|
|
44
|
+
NikGapps/helper/compression/Export.py,sha256=2FewOrlN-hZc_r90vvfGx7DDx4UqUi9Sha4sSyEIzEU,9581
|
|
45
45
|
NikGapps/helper/compression/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
46
46
|
NikGapps/helper/git/TestGit.py,sha256=DGSksIqMn3KpkbPpz-eiQEDJgHOoV6JpmgclEN_lS0k,2674
|
|
47
47
|
NikGapps/helper/git/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
@@ -54,9 +54,9 @@ NikGapps/helper/overlay/Resources.py,sha256=bKWJEF2avl3j2ud390HQq9fRMMA8GKh9-KAB
|
|
|
54
54
|
NikGapps/helper/overlay/String.py,sha256=nyCAD_dNfwHlOgj4zuKGGz71n20CLEKyZCgrVAmiX2I,469
|
|
55
55
|
NikGapps/helper/overlay/StringArray.py,sha256=DYPEAIdpicaJ3C08IYW6Q2tnTH6gUFXmu3KhQlHGY5g,563
|
|
56
56
|
NikGapps/helper/overlay/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
57
|
-
nikgapps-3.
|
|
58
|
-
nikgapps-3.
|
|
59
|
-
nikgapps-3.
|
|
60
|
-
nikgapps-3.
|
|
61
|
-
nikgapps-3.
|
|
62
|
-
nikgapps-3.
|
|
57
|
+
nikgapps-3.63.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
|
|
58
|
+
nikgapps-3.63.dist-info/METADATA,sha256=AMAipR_qKqEdaRFYNpFnZAXDKONSEPIQ3j-eTV6ik_4,4343
|
|
59
|
+
nikgapps-3.63.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
|
|
60
|
+
nikgapps-3.63.dist-info/entry_points.txt,sha256=iKbeOiuELwTDu5kmQHrU9XBVASWRR6_TuRIRva2UnAY,286
|
|
61
|
+
nikgapps-3.63.dist-info/top_level.txt,sha256=CD7RpCb7bzjyvpQLt8hh2gU6X1wj3Z0NIErVkg-nJI4,9
|
|
62
|
+
nikgapps-3.63.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|