modified: scripts/bash/init/rshlibs.bash

modified: scripts/bash/init/ushlibs.bash modified: ztree.sha512.sum
SDRausty · Oct 13, 2019 · 91bec2d · 91bec2d
1 parent 2c17a8a
commit 91bec2d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 21 deletions.
diff --git a/scripts/bash/init/rshlibs.bash b/scripts/bash/init/rshlibs.bash
@@ -38,15 +38,9 @@ trap _SRSTRPQUIT_ QUIT
 _IFSHLIBS_() { 
 	if [[ ! -d "$RDR"/scripts/bash/shlibs ]] 
 	then
-		git clone https://github.com/shlibs/shlibs.bash scripts/bash/shlibs && git clone https://github.com/shlibs/shlibs.buildAPKs.bash scripts/bash/shlibs/buildAPKs || printf "\\nCannot clone modules %s and %s into~/%s/scripts/bash/shlibs and ~/%s/scripts/bash/shlibs/buildAPKs: Continuing...\\n\\n" "https://github.com/shlibs/shlibs.bash" "https://github.com/shlibs/shlibs.buildAPKs.bash" "${RDR##*/}" "${RDR##*/}"
+		git clone https://github.com/shlibs/shlibs.bash scripts/bash/shlibs || printf "\\nCannot clone module %s into~/%s/scripts/bash/shlibs: Continuing...\\n\\n" "https://github.com/shlibs/shlibs.bash" "${RDR##*/}"
 	fi
 }
 
-export RDR="$HOME/buildAPKs"   
-cd "$RDR"
-if [[ ! -f "$RDR"/scripts/bash/shlibs/.git ]] 
-then
-	git pull || printf "\\nCannot update ~/%s: Continuing...\\n\\n" "${RDR##*/}"
-fi
 _IFSHLIBS_
 # rshlibs.bash EOF
diff --git a/scripts/bash/init/ushlibs.bash b/scripts/bash/init/ushlibs.bash
@@ -38,16 +38,14 @@ trap _SRSTRPQUIT_ QUIT
 _UFSHLIBS_() { 
 	if grep shlibs .gitmodules 1>/dev/null
 	then
-		printf "\\e[1;7;38;5;96m%s\\e[0m\\n" "Updating ~/buildAPKs/scripts/bash/shlibs..." && git submodule update --init --recursive --remote scripts/bash/shlibs || printf "\\nCannot update ~/%s/scripts/bash/shlibs: Continuing...\\n\\n" "${RDR##*/}"
+		printf "\\e[1;7;38;5;96mUpdating ~/%s/scripts/bash/shlibs...\\e[0m\\n" "${RDR##*/}" ; git submodule update scripts/bash/shlibs || printf "\\nCannot update module ~/%s/scripts/bash/shlibs: Continuing...\\n\\n" "${RDR##*/}"
 	else
-		printf "\\e[1;7;38;5;96m%s\\e[0m\\n" "Adding and updating ~/buildAPKs/scripts/bash/shlibs..." && git submodule add https://github.com/shlibs/shlibs.bash scripts/bash/shlibs && git submodule update --init --recursive --remote scripts/bash/shlibs || printf "\\nCannot add and update module ~/%s/scripts/bash/shlibs: Continuing...\\n\\n" "${RDR##*/}"
+		printf "\\e[1;7;38;5;96mAdding ~/%s/scripts/bash/shlibs...\\e[0m\\n" "${RDR##*/}" ; git submodule add https://github.com/shlibs/shlibs.bash scripts/bash/shlibs || printf "\\nCannot add modules ~/%s/scripts/bash/shlibs: Continuing...\\n\\n" "${RDR##*/}"
 	fi
 }
 
-export RDR="$HOME/buildAPKs"   
 if [[ ! -f "$RDR"/scripts/bash/shlibs/.git ]] 
 then
-	cd "$RDR"
 	git pull || printf "\\nCannot update ~/%s: Continuing...\\n\\n" "${RDR##*/}"
 	_UFSHLIBS_
 fi

diff --git a/ztree.sha512.sum b/ztree.sha512.sum
@@ -1,40 +1,40 @@
 a586bd0b3fc3419ce73ac9e56217b7ecaac85acc518168d9d8e8032c95d7b73ac8b8e7666034ca9eb6735ca53640feaaecec7d37f80a29b94ee7eea4b6290777  ./CHANGE.log
+ae7e3bf1dbc9739b31c7d47d0664361d9df21fe3bd0d06bff52f2ecad228dc45ba25536f9a866df743fbd7074d116fbdfac199c1342ab2a1270a735d7877ef05  ./LICENSE
+b79800c85ecbaaad1fee7c9d99a4b552a54ad206b338cb992a2c074aa44d46405d6a3ac0b562289a885076ff6ca816411e134bf5cff4e24141a0bb31b4e8e52d  ./README.md
 4e8f53d475c3943b38387684bca60da5597aad962d1d83ebd00c0fd106c2531b0a4461197bf90336b0166ede6132632164f002f6b36b03c15f1835918e02e504  ./conf/GAUTH
 97f4571244e7e7ae9353d6cb74f972775a8409c76b69b4684a1ca5bcb7087877ce97d18c87250680feee5f96937cdd626c57278189081a54f8abf21d1c4d1712  ./conf/NUNAMES
 5c84dec13cc7ac34756e05518299780ed3f70df17cc372467556b89d1c35a1746eff56b4e310550f116ffb2278c8c07a8c20a7cde42b0b28a1eaa86e1827ba2e  ./conf/ONAMES
 84c1bd9cfbe3cbc613eb3c583889f4e60e503560990f71d51245c901135e5a7473c615077100f170eb65aefc7a243c9edd3b32662d09c3c85ee1e5d1b9f1d382  ./conf/TNAMES
 9f3d86003586485ca13cb3cb36c5ec71c9dc083f029fe023502dadca361552de8785cb00723899ea9d714daf83769215183f210d1ed78ca66cb29976c4fe0acb  ./conf/UNAMES
 d5f2acc76ffb8d9a552b646863b96a9f41b8011a68b64db14b54abcb4fb7cd72eb7094c1ad2afaa26d29af5ffc29b7035805f90aa9aa0003d1e2a014f4bc62c4  ./conf/VERSIONID
 af0cd8fbf7aecfae6bc45bd6ebafe608b9cc561b3c42a692edef38ed517d371d1b372d16ae3982daaa6eac5518d8ea15a3f46a0b0e92c78d6cb55de8b9869ba1  ./do.sums.bash
-ae7e3bf1dbc9739b31c7d47d0664361d9df21fe3bd0d06bff52f2ecad228dc45ba25536f9a866df743fbd7074d116fbdfac199c1342ab2a1270a735d7877ef05  ./LICENSE
-b79800c85ecbaaad1fee7c9d99a4b552a54ad206b338cb992a2c074aa44d46405d6a3ac0b562289a885076ff6ca816411e134bf5cff4e24141a0bb31b4e8e52d  ./README.md
-c6b90753af18c128c0f72716c677e08b8d34691e3a9b66404c946a47221ef600af5e1ed220787b08a7b8c7a73ba36fab8846a6cd24a346e358b9363e9c5ea1b3  ./scripts/bash/build/buildAll.bash
-76beaf846f73af6563f594ad548dee629674ac85cec758cef624f5ba66683bee73b88a14f6bc9badc6886c5653164fe6ffe4478ef01308f00e7d9a8c9e4f8868  ./scripts/bash/build/buildApplications.bash
 e58f9f97da56a01965e3dc58c9277973c915d8eae6726945afe67e89718ce8138cd2bc5c067753f358044f14348aa02d662aa2af4bc2d144bc60ce463ca1771f  ./scripts/bash/build/build.apps.bash
-f5adf5b8df9f60167b95472d5e90853ddee32447ec80d4763873f3d7b96c4d090e08c7dd29fee1636183546460a572352140bbd356546aa897a2a42ec14282f5  ./scripts/bash/build/buildBrowsers.bash
 6b32879014807ceb305b4801e708016b0146b7ba2d94df731517ab4a6ac65cd6936851b897907d81854100e1a54930953d43a75b5c703ebdc711185a44d696a0  ./scripts/bash/build/build.buildAPKs.bash
 3c7fbc0949545602e2263d65d2fe9da52a929256845c4ef055e5b83867663abc9010660b619072a904a436074c444720baf923aefd497f5272816528a1a3e36a  ./scripts/bash/build/build.clocks.bash
 0a3cf39bd5b795e6262b17720662fa191b293f0c925e42b2e7f1a4524984e3b6506ab6ebce53a8ee0f9494d2b0bc8226a38ffe7b4c243fdc3103a98e39096560  ./scripts/bash/build/build.compasses.bash
 914dd7af06f32c80958bef55def9cb3586d25b0aeba6c442193f2f627c276fac73358ec25174eace2b463769be07a5babe51c4927404d20916a703475b92fcbc  ./scripts/bash/build/build.developers.tools.bash
 4c1c723ce18a400c784219b912b4b12a27a0ffe078bb9e83063eee368200aae8ff45fd4a55bec8dcd39938f5104e5dad92871948da935b3ef6be656b9d6a53bf  ./scripts/bash/build/build.entertainment.bash
 26d8cafaa7cd05a28e85f5fe91539b11ccd659a0adb5da08fd0fc6c7a6aa9c127bc3591589eff6fce0c5d6e9890236760f010057deb6a497288f62f2b4f8345f  ./scripts/bash/build/build.flashlights.bash
-11a0518da4298eac0aded31fe8b581f94aaa619660848f0fe30c230416154b1583afd2a206f8533004b1ae64d2cef6b8640e84874ec937cf3249579eb41ff2d6  ./scripts/bash/build/buildFlashlights.bash
 3d8ad2fe7b5a9b4d4b03a25d62497a2516e3dc5aba9ed0fe684862a70a47873897106be929dfe19202fba2447fe241e0bbf04b4d451cf8336367d2f20b757618  ./scripts/bash/build/build.games.bash
-8233ab32caba92949f24ab2a542d5619856beedc2a43f4376e0605539d1febfb815c01d4add7df396b9fb0d3a2e1bedb037601a27ab3695edc878325ac8df1d4  ./scripts/bash/build/buildGames.bash
 f69a8a5e72a5e05c3b26396e8c9b0d56527d87c8ff3ce21438f01a2c26b3844439f61008911c44945992dfe313d35db4057156d18d804567854f66b3638f719a  ./scripts/bash/build/build.in.dir.bash
 7de79d1186f13ad622147c1e5b3644153e9cf8c47e1ac20589c2ef2dd1d4894045c353116ea4be8f9dfaf6c63d76337fe2aac4dffb92d8c4af92201ca8150de4  ./scripts/bash/build/build.live.wallpapers.bash
 639e03ca06cde77f7f24737e2b908f14800997a60789bc386afbee4e993a4c94f3be9a8fc7cc6dbec90dc64197f0d2aa75755d177d27986048e5d67906385b59  ./scripts/bash/build/build.one.bash
 d75cb911c604174f68389ff973d0084bb08d174dbc7a02d21beb1defeee485121f122688208c10a815e1e5fd1a32a469fce5587c945e472ac0b010d6c30c4d10  ./scripts/bash/build/build.samples.bash
+c6b90753af18c128c0f72716c677e08b8d34691e3a9b66404c946a47221ef600af5e1ed220787b08a7b8c7a73ba36fab8846a6cd24a346e358b9363e9c5ea1b3  ./scripts/bash/build/buildAll.bash
+76beaf846f73af6563f594ad548dee629674ac85cec758cef624f5ba66683bee73b88a14f6bc9badc6886c5653164fe6ffe4478ef01308f00e7d9a8c9e4f8868  ./scripts/bash/build/buildApplications.bash
+f5adf5b8df9f60167b95472d5e90853ddee32447ec80d4763873f3d7b96c4d090e08c7dd29fee1636183546460a572352140bbd356546aa897a2a42ec14282f5  ./scripts/bash/build/buildBrowsers.bash
+11a0518da4298eac0aded31fe8b581f94aaa619660848f0fe30c230416154b1583afd2a206f8533004b1ae64d2cef6b8640e84874ec937cf3249579eb41ff2d6  ./scripts/bash/build/buildFlashlights.bash
+8233ab32caba92949f24ab2a542d5619856beedc2a43f4376e0605539d1febfb815c01d4add7df396b9fb0d3a2e1bedb037601a27ab3695edc878325ac8df1d4  ./scripts/bash/build/buildGames.bash
 38428ef32655b1105f60a207223f5d35425c28fdd2e968a7da90aee5935187949e9a67e6f5f6259c6931e348827c1da0593e4a5802a566b1dbf22c6dc5a51c16  ./scripts/bash/build/buildSamples.bash
 323491c414fa3e33ce1fa6f78a413d6929a534f0dcc3cb009ddfc6a7cb4f92b0f7850408c8cc6be22bc6f18711ecea0c631f9253605824bb8010a78598a9a24d  ./scripts/bash/build/buildTop10.bash
 8396e078833b4bc5d7caba56d3778f8b0980705a8630b620f5d1573a39512bef204d9f3336cf3a767f54db2886d6fc2437c30975efd4eaabdb5e0e2ddd66a7b4  ./scripts/bash/build/buildTutorials.bash
 9a49ef3d1f41864eb62906b3c44bd90b80b5ad9d47958dc9f1d3e08a5d544e4f40d34f1b479e943855e8788b6622ea3496e8a023b2067798ac392f2efcd9f9c6  ./scripts/bash/build/buildWidgets.bash
-7d49ec001856fad857da2818093ff49b53961945b168656f88a1e60de9831c0775924dd48831e9058be6d8933a1efeb450ab97414dc8a79cbb9a59e36a49ada8  ./scripts/bash/init/ecjtdebs/fix.ecj4.6.error.bash
 4b07c98f03e40e97b6dd15f0a05dcc55b064385cfb22f95278f8af8498877e9b9761e8154112584bb6e1afd7c5adda1234d7b6bba20c88d620ae6c931ae7ec48  ./scripts/bash/init/ecjtdebs/fix.ecj.error.bash
+7d49ec001856fad857da2818093ff49b53961945b168656f88a1e60de9831c0775924dd48831e9058be6d8933a1efeb450ab97414dc8a79cbb9a59e36a49ada8  ./scripts/bash/init/ecjtdebs/fix.ecj4.6.error.bash
 7d0f4cd0bc680ce4e7d275b0316906916b7f38fb28cdb11cd9aaeb7a8b2cfacebafe9a59084fb97e2fd1d005ceb733c9591f6b338ff86427a6e41d610c67e868  ./scripts/bash/init/init.bash
-00232a954b7868476d76fada0d501aaf2412d5873a428cdf03d38cee28ecdc46037c81610675711a0dec2207315df7f8000e7763783b6b2d2a66a9e5d0954d09  ./scripts/bash/init/rshlibs.bash
+f45b76872607a2fee5aa6223faea710b763a6ae41b9bbee855d000ffa443b8d0c070815e9b85883e06c90b055f42c2aa8f61dee9b5d56fec3ea0241941e5564b  ./scripts/bash/init/rshlibs.bash
 6a4531820d535e7a4c75e7aca2c4398ae4c1549c6dfe16969d7e472ac3f3608140e784620d744e68a83a0175d8847d68ac5f725d17dc47dc927383d75f643f98  ./scripts/bash/init/setup.buildAPKs.bash
-6246808c8b967888a2de5cd49f4f575fd547d81d7fbcaf10b8cb20adc8d783a72803b955961d84bc7a8ce3f9a0e102627f8d2cad40d01cd805c6da34d29f56cc  ./scripts/bash/init/ushlibs.bash
+5ad189e69ca88f348b522f0f6147b2e97d9b46242966884110b8ddc603350331f2918564a13d8f213663011ff4825bbf71b6d667a7d5482201a8c11c73c8aac7  ./scripts/bash/init/ushlibs.bash
 fa6ab37f93d608149ef2391190d4b054ef5e9c99d8e4b063164c6c1132488756c21e91116c49d4d467772b43f3d9d68e5f28f6f67779db2c0569e4cb38a0fe6b  ./scripts/sh/build/build.dir.sh
 38a480b99ecfc1517a7c0156df06afd4957b242b452ff651bf160b3db23465ae4b0699bca6a6126c92038a79096f05dbca57bed88d6ba5430c7c95ee1ae60a3e  ./scripts/sh/build/build.sh
 7c06f226df4d051d4956ea1ab6cb19cb630ea8e2a47fe38be8b70151a94b642a0740bd3079981a5101c3701fb3daa8172a4aa63b9e93bdac2c0fa62b66bbbb3c  ./scripts/sh/init/setup.BuildAPKs.sh