Skip to content

Commit

Permalink
commit 787229352 on 20210703
Browse files Browse the repository at this point in the history
  • Loading branch information
SDRausty committed Jul 4, 2021
1 parent 748e561 commit 84f9f67
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .conf/VERSIONID
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.411
1.0.412
19 changes: 9 additions & 10 deletions buildAPKs/init/build.buildAPKs.modules.bash
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ _2GSU_() {
do
printf "%s\\n" "~/${RDR##*/}/$GLOC/.git"
done
printf "\\nTo update the modules in '~/%s' to the newest version please run '~/%s/update.buildAPKs.sh' to remove these '.git' files:\\n\\n~/%s/scripts/bash/shlibs/.git\\n" "${RDR##*/}" "${RDR##*/}" "${RDR##*/}"
printf "\\nThen run '%s' again, and '%s' will attempt to update them all.\\n" "${0##*/}" "${0##*/}"
printf "\\nThen run '%s' again, and '%s' will attempt to update all them.\\n" "${0##*/}" "${0##*/}"
else
_GSMU_
fi
Expand All @@ -36,16 +35,16 @@ _CK4MS_() { # ChecKs 4 ModuleS
}

_GSA_() { # update submodules to latest version
((printf "\\e[1;7;38;5;96m%s\\e[0m\\n" "Adding $SIAD/${GBMS[$LOC]} to ~/buildAPKs/$LOC..." && git submodule add "$SIAD/${GBMS[$LOC]}" "$LOC") && (printf "\\e[1;7;38;5;96m%s\\e[0m\\n" "Updating ~/${RDR##*/}/$LOC..." && git submodule update --init --recursive --remote "$LOC" && _IAR_ "$JDR")) || (printf "\\e[1;7;38;5;66m%s\\e[0m\\n" "Cannot add and update ~/${RDR##*/}/$LOC: Continuing...")
((printf "\\e[1;7;38;5;96m%s\\e[0m\\n" "Adding $SIAD/${GBMS[$LOC]} to ~/${RDR##*/}/$LOC..." && git submodule add "$SIAD/${GBMS[$LOC]}" "$LOC") && (printf "\\e[1;7;38;5;96m%s\\e[0m\\n" "Updating ~/${RDR##*/}/$LOC..." && git submodule update --init --recursive --remote "$LOC" && _IAR_ "$JDR")) || (printf "\\e[1;7;38;5;66m%s\\e[0m\\n" "Cannot add and update ~/${RDR##*/}/$LOC: Continuing...")
}

_GSMU_() {
printf "\\e[1;7;38;5;114mUpdating buildAPKs; \\e[1;7;38;5;112m%s\\e[1;7;38;5;114m will attempt to load sources from git submodule repositories into \\e[1;7;38;5;113m~/%s\\e[1;7;38;5;114m. This may take a little while to complete. Please be patient while \\e[1;7;38;5;112m%s\\e[1;7;38;5;114m downloads source code from \\e[1;7;38;5;113m%s:\\e[0m\\n" "${0##*/}" "${RDR##*/}" "${0##*/}" "$SIAD"
. "$RDR"/scripts/bash/init/ushlibs.bash
. "$RDR"/scripts/bash/shlibs/buildAPKs/at.bash
. "$RDR"/scripts/bash/shlibs/buildAPKs/prep.bash
. "$RDR"/scripts/bash/shlibs/buildAPKs/init/mod.bash 0
. "$RDR"/scripts/bash/shlibs/lock.bash
printf "\\e[1;7;38;5;114mUpdating %s; \\e[1;7;38;5;112m%s\\e[1;7;38;5;114m will attempt to load sources from git submodule repositories into \\e[1;7;38;5;113m~/%s\\e[1;7;38;5;114m. This may take a little while to complete. Please be patient while \\e[1;7;38;5;112m%s\\e[1;7;38;5;114m downloads source code from \\e[1;7;38;5;113m%s:\\e[0m\\n" "${RDR##*/}" "${0##*/}" "${RDR##*/}" "${0##*/}" "$SIAD"
. "$RDR/scripts/bash/init/ushlibs.bash"
. "$RDR/scripts/bash/shlibs/buildAPKs/at.bash"
. "$RDR/scripts/bash/shlibs/buildAPKs/prep.bash"
. "$RDR/scripts/bash/shlibs/buildAPKs/init/mod.bash" 0
. "$RDR/scripts/bash/shlibs/lock.bash"
[[ ! -d "$RDR/sources" ]] && mkdir -p "$RDR/sources"
for LOC in "${!GBMS[@]}"
do
Expand All @@ -58,7 +57,7 @@ _GSMU_() {
}

_GSU_() { # update submodules to latest version
((printf "\\e[1;7;38;5;96m%s\\e[0m\\n" "Updating ~/buildAPKs/$LOC..." && git submodule update --init --recursive --remote "$LOC" && _IAR_ "$JDR") || ( _GSA_ || (JAD="${!GBMS[@]}" ; JID="${LOC##*/}" ; _UMODS_ ; _GTSAM_ ))) || (printf "\\e[1;7;38;5;66m%s\\e[0m\\n" "Cannot update ~/buildAPKs/$LOC: Continuing...") # https://www.tecmint.com/chaining-operators-in-linux-with-practical-examples/
((printf "\\e[1;7;38;5;96m%s\\e[0m\\n" "Updating ~/${RDR##*/}/$LOC..." && git submodule update --init --recursive --remote "$LOC" && _IAR_ "$JDR") || ( _GSA_ || (JAD="${!GBMS[@]}" ; JID="${LOC##*/}" ; _UMODS_ ; _GTSAM_ ))) || (printf "\\e[1;7;38;5;66m%s\\e[0m\\n" "Cannot update ~/${RDR##*/}/$LOC: Continuing...") # https://www.tecmint.com/chaining-operators-in-linux-with-practical-examples/
[[ -f "$JDR"/ma.bash ]] && . "$JDR"/ma.bash
}

Expand Down
4 changes: 2 additions & 2 deletions sha512.sum
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
f477bf1c6ef67b54b515c29bd2d30943c804e83a911dd5fc17793dcd10ee60cbded76630dff0880161200b16ad62070059a9a21804b51575a7fcfe5d3fcce33e ./.conf/VERSIONID
7e03d4683077f3c3c78d0e2d58e5e63a0de44dfe179a555ca607ad468b68baf12c6fe8daabc7493b25e186afb2b2c8ed1a43d45a703ab238ac1146ddc1f2b303 ./.conf/VERSIONID
05a502a845e35bc0495a3a3006ae914785c48679dddd362bd98bd33c306ed2aa8fac57344b1b65955d41755c3967f3e991770764f6c2f14c6a52f3e52e00ef1c ./.github/FUNDING.yml
503fbdd756ac28eba94e27e9b584c2a4532b78df5eb2fe66b747a67350a56ee579e08680ae637d80de9fa264bf5e099bb4e48a82bf2f0e32358eedfe018fdb15 ./.github/workflows/greetings.yml
5e20f4451f28b2ad8cd03e174bafa7c5d2d08cb3d9c6364a1f36b47fa1a2ae7e222970337f1481f149b6f87894f59e113bc49924776d558f0eb0773f6eebcd56 ./.github/workflows/label.yml
Expand All @@ -14,7 +14,7 @@ d10d83eeb1a5bd55989b627713b4278b14327f742b2921a99b4cdf3b468ca3e907327a9af110c478
e0f64512af86e810f80ff43590c4909e4c7f1436feb179f61a71e4b1f9259602c67a0b847b86c839114c28b9c6d24230c1a5bc35a92dd2cb887af9b979008f5f ./buildAPKs/doso.bash
9c1a9dd5227669ef43350058df23e7b9e45b16733d1622c2cf22a3726b5326b400e37a78fd6c2baad8219dd0251353fbce01c51e8c416da633e250ab839b2fa4 ./buildAPKs/extstdo.bash
9117f594d155247fe382cd55573738745d5e50cdda329dd0c7f9d1bb30d6c35bfd17c7edc9c7f500c90acc90c4155e2cd8a1d1714896be943cd03031b7bf4b31 ./buildAPKs/fandm.bash
55f19ba96183d5d943462df78f01f77dddaa7fca3bbcadb37987b1df9cd6c96d990945128d6efaaeec7ddf7cc88b572ebee926d8fa533956a69e2243642b910a ./buildAPKs/init/build.buildAPKs.modules.bash
6767cac2ade4bfd7a9336e1c3c889addbf9f91218a048d7b6b1d5ea8e63330fec9c89f6d36630fcf818078614133e740cba5ec442ea151ba5174896e27723217 ./buildAPKs/init/build.buildAPKs.modules.bash
8d965ff9ff67ff2646cc6224afc548adbc6c1489cc5dd4c7ff2eb5a9b5b9753273a16167d377eabefb9ffbcdbc0dc277be3fe9e7084f7856875ecaa0ef863053 ./buildAPKs/init/mod.bash
82a6f17e07b7e7d49cadae53bb8dc2464c14e0a98096d967e87ca0d417ab793bbea108aa4e965233eb9b94387a84b2f8315eb1d611f4189e56d832a78a1b9efb ./buildAPKs/prep.bash
820822fcca3909ae528b770f80b0015278d92cbad002599726338a67b65c52cb4a9a09e7e173929b0a0fc727209f5a7af09eecaf5fdeecfaa22fd6f423e88550 ./buildAPKs/prep.heavy.bash
Expand Down

1 comment on commit 84f9f67

@SDRausty
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.