Merge branch 'trunk' into xlin-pysshnpd-patch

examples/automations/python/requirements.txt

@@ -1,31 +1,31 @@
-bcrypt==4.1.2 ; python_version >= "3.8" and python_version < "4.0" \
-    --hash=sha256:02d9ef8915f72dd6daaef40e0baeef8a017ce624369f09754baf32bb32dba25f \
-    --hash=sha256:1c28973decf4e0e69cee78c68e30a523be441972c826703bb93099868a8ff5b5 \
-    --hash=sha256:2a298db2a8ab20056120b45e86c00a0a5eb50ec4075b6142db35f593b97cb3fb \
-    --hash=sha256:33313a1200a3ae90b75587ceac502b048b840fc69e7f7a0905b5f87fac7a1258 \
-    --hash=sha256:3566a88234e8de2ccae31968127b0ecccbb4cddb629da744165db72b58d88ca4 \
-    --hash=sha256:387e7e1af9a4dd636b9505a465032f2f5cb8e61ba1120e79a0e1cd0b512f3dfc \
-    --hash=sha256:44290ccc827d3a24604f2c8bcd00d0da349e336e6503656cb8192133e27335e2 \
-    --hash=sha256:57fa9442758da926ed33a91644649d3e340a71e2d0a5a8de064fb621fd5a3326 \
-    --hash=sha256:68e3c6642077b0c8092580c819c1684161262b2e30c4f45deb000c38947bf483 \
-    --hash=sha256:69057b9fc5093ea1ab00dd24ede891f3e5e65bee040395fb1e66ee196f9c9b4a \
-    --hash=sha256:6cad43d8c63f34b26aef462b6f5e44fdcf9860b723d2453b5d391258c4c8e966 \
-    --hash=sha256:71b8be82bc46cedd61a9f4ccb6c1a493211d031415a34adde3669ee1b0afbb63 \
-    --hash=sha256:732b3920a08eacf12f93e6b04ea276c489f1c8fb49344f564cca2adb663b3e4c \
-    --hash=sha256:9800ae5bd5077b13725e2e3934aa3c9c37e49d3ea3d06318010aa40f54c63551 \
-    --hash=sha256:a97e07e83e3262599434816f631cc4c7ca2aa8e9c072c1b1a7fec2ae809a1d2d \
-    --hash=sha256:ac621c093edb28200728a9cca214d7e838529e557027ef0581685909acd28b5e \
-    --hash=sha256:b8df79979c5bae07f1db22dcc49cc5bccf08a0380ca5c6f391cbb5790355c0b0 \
-    --hash=sha256:b90e216dc36864ae7132cb151ffe95155a37a14e0de3a8f64b49655dd959ff9c \
-    --hash=sha256:ba4e4cc26610581a6329b3937e02d319f5ad4b85b074846bf4fef8a8cf51e7bb \
-    --hash=sha256:ba55e40de38a24e2d78d34c2d36d6e864f93e0d79d0b6ce915e4335aa81d01b1 \
-    --hash=sha256:be3ab1071662f6065899fe08428e45c16aa36e28bc42921c4901a191fda6ee42 \
-    --hash=sha256:d75fc8cd0ba23f97bae88a6ec04e9e5351ff3c6ad06f38fe32ba50cbd0d11946 \
-    --hash=sha256:e51c42750b7585cee7892c2614be0d14107fad9581d1738d954a262556dd1aab \
-    --hash=sha256:ea505c97a5c465ab8c3ba75c0805a102ce526695cd6818c6de3b1a38f6f60da1 \
-    --hash=sha256:eb3bd3321517916696233b5e0c67fd7d6281f0ef48e66812db35fc963a422a1c \
-    --hash=sha256:f70d9c61f9c4ca7d57f3bfe88a5ccf62546ffbadf3681bb1e268d9d2e41c91a7 \
-    --hash=sha256:fbe188b878313d01b7718390f31528be4010fed1faa798c5a1d0469c9c48c369
+bcrypt==4.1.3 ; python_version >= "3.8" and python_version < "4.0" \
+    --hash=sha256:01746eb2c4299dd0ae1670234bf77704f581dd72cc180f444bfe74eb80495b64 \
+    --hash=sha256:037c5bf7c196a63dcce75545c8874610c600809d5d82c305dd327cd4969995bf \
+    --hash=sha256:094fd31e08c2b102a14880ee5b3d09913ecf334cd604af27e1013c76831f7b05 \
+    --hash=sha256:0d4cf6ef1525f79255ef048b3489602868c47aea61f375377f0d00514fe4a78c \
+    --hash=sha256:193bb49eeeb9c1e2db9ba65d09dc6384edd5608d9d672b4125e9320af9153a15 \
+    --hash=sha256:2505b54afb074627111b5a8dc9b6ae69d0f01fea65c2fcaea403448c503d3991 \
+    --hash=sha256:2ee15dd749f5952fe3f0430d0ff6b74082e159c50332a1413d51b5689cf06623 \
+    --hash=sha256:31adb9cbb8737a581a843e13df22ffb7c84638342de3708a98d5c986770f2834 \
+    --hash=sha256:3a5be252fef513363fe281bafc596c31b552cf81d04c5085bc5dac29670faa08 \
+    --hash=sha256:3d3b317050a9a711a5c7214bf04e28333cf528e0ed0ec9a4e55ba628d0f07c1a \
+    --hash=sha256:48429c83292b57bf4af6ab75809f8f4daf52aa5d480632e53707805cc1ce9b74 \
+    --hash=sha256:4a8bea4c152b91fd8319fef4c6a790da5c07840421c2b785084989bf8bbb7455 \
+    --hash=sha256:4fb253d65da30d9269e0a6f4b0de32bd657a0208a6f4e43d3e645774fb5457f3 \
+    --hash=sha256:551b320396e1d05e49cc18dd77d970accd52b322441628aca04801bbd1d52a73 \
+    --hash=sha256:5f7cd3399fbc4ec290378b541b0cf3d4398e4737a65d0f938c7c0f9d5e686611 \
+    --hash=sha256:6004f5229b50f8493c49232b8e75726b568535fd300e5039e255d919fc3a07f2 \
+    --hash=sha256:6717543d2c110a155e6821ce5670c1f512f602eabb77dba95717ca76af79867d \
+    --hash=sha256:6cac78a8d42f9d120b3987f82252bdbeb7e6e900a5e1ba37f6be6fe4e3848286 \
+    --hash=sha256:8a893d192dfb7c8e883c4576813bf18bb9d59e2cfd88b68b725990f033f1b978 \
+    --hash=sha256:8cbb119267068c2581ae38790e0d1fbae65d0725247a930fc9900c285d95725d \
+    --hash=sha256:9f8ea645eb94fb6e7bea0cf4ba121c07a3a182ac52876493870033141aa687bc \
+    --hash=sha256:c4c8d9b3e97209dd7111bf726e79f638ad9224b4691d1c7cfefa571a09b1b2d6 \
+    --hash=sha256:cb9c707c10bddaf9e5ba7cdb769f3e889e60b7d4fea22834b261f51ca2b89fed \
+    --hash=sha256:d84702adb8f2798d813b17d8187d27076cca3cd52fe3686bb07a9083930ce650 \
+    --hash=sha256:ec3c2e1ca3e5c4b9edb94290b356d082b721f3f50758bce7cce11d8a7c89ce84 \
+    --hash=sha256:f44a97780677e7ac0ca393bd7982b19dbbd8d7228c1afe10b128fd9550eef5f1 \
+    --hash=sha256:f5698ce5292a4e4b9e5861f7e53b1d89242ad39d54c3da451a93cac17b61921a
 cffi==1.16.0 ; python_version >= "3.8" and python_version < "4.0" \
     --hash=sha256:0c9ef6ff37e974b73c25eecc13952c55bceed9112be2d9d938ded8e856138bcc \
     --hash=sha256:131fd094d1065b19540c3d72594260f118b231090295d8c34e19a7bbcf2e860a \
@@ -79,39 +79,39 @@ cffi==1.16.0 ; python_version >= "3.8" and python_version < "4.0" \
     --hash=sha256:ee07e47c12890ef248766a6e55bd38ebfb2bb8edd4142d56db91b21ea68b7627 \
     --hash=sha256:fa3a0128b152627161ce47201262d3140edb5a5c3da88d73a1b790a959126956 \
     --hash=sha256:fcc8eb6d5902bb1cf6dc4f187ee3ea80a1eba0a89aba40a5cb20a5087d961357
-cryptography==42.0.5 ; python_version >= "3.8" and python_version < "4.0" \
-    --hash=sha256:0270572b8bd2c833c3981724b8ee9747b3ec96f699a9665470018594301439ee \
-    --hash=sha256:111a0d8553afcf8eb02a4fea6ca4f59d48ddb34497aa8706a6cf536f1a5ec576 \
-    --hash=sha256:16a48c23a62a2f4a285699dba2e4ff2d1cff3115b9df052cdd976a18856d8e3d \
-    --hash=sha256:1b95b98b0d2af784078fa69f637135e3c317091b615cd0905f8b8a087e86fa30 \
-    --hash=sha256:1f71c10d1e88467126f0efd484bd44bca5e14c664ec2ede64c32f20875c0d413 \
-    --hash=sha256:2424ff4c4ac7f6b8177b53c17ed5d8fa74ae5955656867f5a8affaca36a27abb \
-    --hash=sha256:2bce03af1ce5a5567ab89bd90d11e7bbdff56b8af3acbbec1faded8f44cb06da \
-    --hash=sha256:329906dcc7b20ff3cad13c069a78124ed8247adcac44b10bea1130e36caae0b4 \
-    --hash=sha256:37dd623507659e08be98eec89323469e8c7b4c1407c85112634ae3dbdb926fdd \
-    --hash=sha256:3eaafe47ec0d0ffcc9349e1708be2aaea4c6dd4978d76bf6eb0cb2c13636c6fc \
-    --hash=sha256:5e6275c09d2badf57aea3afa80d975444f4be8d3bc58f7f80d2a484c6f9485c8 \
-    --hash=sha256:6fe07eec95dfd477eb9530aef5bead34fec819b3aaf6c5bd6d20565da607bfe1 \
-    --hash=sha256:7367d7b2eca6513681127ebad53b2582911d1736dc2ffc19f2c3ae49997496bc \
-    --hash=sha256:7cde5f38e614f55e28d831754e8a3bacf9ace5d1566235e39d91b35502d6936e \
-    --hash=sha256:9481ffe3cf013b71b2428b905c4f7a9a4f76ec03065b05ff499bb5682a8d9ad8 \
-    --hash=sha256:98d8dc6d012b82287f2c3d26ce1d2dd130ec200c8679b6213b3c73c08b2b7940 \
-    --hash=sha256:a011a644f6d7d03736214d38832e030d8268bcff4a41f728e6030325fea3e400 \
-    --hash=sha256:a2913c5375154b6ef2e91c10b5720ea6e21007412f6437504ffea2109b5a33d7 \
-    --hash=sha256:a30596bae9403a342c978fb47d9b0ee277699fa53bbafad14706af51fe543d16 \
-    --hash=sha256:b03c2ae5d2f0fc05f9a2c0c997e1bc18c8229f392234e8a0194f202169ccd278 \
-    --hash=sha256:b6cd2203306b63e41acdf39aa93b86fb566049aeb6dc489b70e34bcd07adca74 \
-    --hash=sha256:b7ffe927ee6531c78f81aa17e684e2ff617daeba7f189f911065b2ea2d526dec \
-    --hash=sha256:b8cac287fafc4ad485b8a9b67d0ee80c66bf3574f655d3b97ef2e1082360faf1 \
-    --hash=sha256:ba334e6e4b1d92442b75ddacc615c5476d4ad55cc29b15d590cc6b86efa487e2 \
-    --hash=sha256:ba3e4a42397c25b7ff88cdec6e2a16c2be18720f317506ee25210f6d31925f9c \
-    --hash=sha256:c41fb5e6a5fe9ebcd58ca3abfeb51dffb5d83d6775405305bfa8715b76521922 \
-    --hash=sha256:cd2030f6650c089aeb304cf093f3244d34745ce0cfcc39f20c6fbfe030102e2a \
-    --hash=sha256:cd65d75953847815962c84a4654a84850b2bb4aed3f26fadcc1c13892e1e29f6 \
-    --hash=sha256:e4985a790f921508f36f81831817cbc03b102d643b5fcb81cd33df3fa291a1a1 \
-    --hash=sha256:e807b3188f9eb0eaa7bbb579b462c5ace579f1cedb28107ce8b48a9f7ad3679e \
-    --hash=sha256:f12764b8fffc7a123f641d7d049d382b73f96a34117e0b637b80643169cec8ac \
-    --hash=sha256:f8837fe1d6ac4a8052a9a8ddab256bc006242696f03368a4009be7ee3075cdb7
+cryptography==42.0.6 ; python_version >= "3.8" and python_version < "4.0" \
+    --hash=sha256:00c0faa5b021457848d031ecff041262211cc1e2bce5f6e6e6c8108018f6b44a \
+    --hash=sha256:073104df012fc815eed976cd7d0a386c8725d0d0947cf9c37f6c36a6c20feb1b \
+    --hash=sha256:076c92b08dd1ab88108bc84545187e10d3693a9299c593f98c4ea195a0b0ead7 \
+    --hash=sha256:089aeb297ff89615934b22c7631448598495ffd775b7d540a55cfee35a677bf4 \
+    --hash=sha256:3b750279f3e7715df6f68050707a0cee7cbe81ba2eeb2f21d081bd205885ffed \
+    --hash=sha256:43e521f21c2458038d72e8cdfd4d4d9f1d00906a7b6636c4272e35f650d1699b \
+    --hash=sha256:4bdb39ecbf05626e4bfa1efd773bb10346af297af14fb3f4c7cb91a1d2f34a46 \
+    --hash=sha256:5967e3632f42b0c0f9dc2c9da88c79eabdda317860b246d1fbbde4a8bbbc3b44 \
+    --hash=sha256:65d529c31bd65d54ce6b926a01e1b66eacf770b7e87c0622516a840e400ec732 \
+    --hash=sha256:6981acac509cc9415344cb5bfea8130096ea6ebcc917e75503143a1e9e829160 \
+    --hash=sha256:81dbe47e28b703bc4711ac74a64ef8b758a0cf056ce81d08e39116ab4bc126fa \
+    --hash=sha256:8b90c57b3cd6128e0863b894ce77bd36fcb5f430bf2377bc3678c2f56e232316 \
+    --hash=sha256:9184aff0856261ecb566a3eb26a05dfe13a292c85ce5c59b04e4aa09e5814187 \
+    --hash=sha256:945a43ebf036dd4b43ebfbbd6b0f2db29ad3d39df824fb77476ca5777a9dde33 \
+    --hash=sha256:97eeacae9aa526ddafe68b9202a535f581e21d78f16688a84c8dcc063618e121 \
+    --hash=sha256:9f1a3bc2747166b0643b00e0b56cd9b661afc9d5ff963acaac7a9c7b2b1ef638 \
+    --hash=sha256:9ff75b88a4d273c06d968ad535e6cb6a039dd32db54fe36f05ed62ac3ef64a44 \
+    --hash=sha256:aeb6f56b004e898df5530fa873e598ec78eb338ba35f6fa1449970800b1d97c2 \
+    --hash=sha256:b16b90605c62bcb3aa7755d62cf5e746828cfc3f965a65211849e00c46f8348d \
+    --hash=sha256:b99831397fdc6e6e0aa088b060c278c6e635d25c0d4d14bdf045bf81792fda0a \
+    --hash=sha256:bc954251edcd8a952eeaec8ae989fec7fe48109ab343138d537b7ea5bb41071a \
+    --hash=sha256:c05230d8aaaa6b8ab3ab41394dc06eb3d916131df1c9dcb4c94e8f041f704b74 \
+    --hash=sha256:d16a310c770cc49908c500c2ceb011f2840674101a587d39fa3ea828915b7e83 \
+    --hash=sha256:d93080d2b01b292e7ee4d247bf93ed802b0100f5baa3fa5fd6d374716fa480d4 \
+    --hash=sha256:e1f5f15c5ddadf6ee4d1d624a2ae940f14bd74536230b0056ccb28bb6248e42a \
+    --hash=sha256:e3442601d276bd9e961d618b799761b4e5d892f938e8a4fe1efbe2752be90455 \
+    --hash=sha256:e85f433230add2aa26b66d018e21134000067d210c9c68ef7544ba65fc52e3eb \
+    --hash=sha256:eecca86813c6a923cabff284b82ff4d73d9e91241dc176250192c3a9b9902a54 \
+    --hash=sha256:f1e933b238978ccfa77b1fee0a297b3c04983f4cb84ae1c33b0ea4ae08266cc9 \
+    --hash=sha256:f4cece02478d73dacd52be57a521d168af64ae03d2a567c0c4eb6f189c3b9d79 \
+    --hash=sha256:f567a82b7c2b99257cca2a1c902c1b129787278ff67148f188784245c7ed5495 \
+    --hash=sha256:f987a244dfb0333fbd74a691c36000a2569eaf7c7cc2ac838f85f59f0588ddc9
 paramiko==3.4.0 ; python_version >= "3.8" and python_version < "4.0" \
     --hash=sha256:43f0b51115a896f9c00f59618023484cb3a14b98bbceab43394a39c6739b7ee7 \
     --hash=sha256:aac08f26a31dc4dffd92821527d1682d99d52f9ef6851968114a8728f3c274d3

packages/dart/sshnoports/bundles/universal.sh

@@ -76,6 +76,14 @@ is_systemd_available() {
   [ -d /run/systemd/system ]
 }
 
+check_cmd() {
+  set +e
+  command -v "$1" > /dev/null 2>&1
+  exitcode=$?
+  set -e
+  return $exitcode
+}
+
 sedi() {
   if is_darwin; then
     sed -i '' "$@"
@@ -337,28 +345,42 @@ Environment:
 EOL
 }
 
+downloader() {
+  if check_cmd curl; then
+    curl -sSfL "$1" -o "$2"
+  elif check_cmd wget; then
+    wget "$1" -q -O "$2"
+  else
+    >&2 echo
+    >&2 echo "Couldn't find curl or wget to download package"
+    >&2 echo "Please install one of them"
+    >&2 echo "Also how did you download this script???"
+    >&2 echo
+    exit 1
+  fi
+}
+
 get_download_url() {
   unset download_urls
-  download_urls=$(
-    curl -fsSL "https://api.github.com/repos/atsign-foundation/noports/releases/$(norm_version $sshnp_version)" |
-      grep browser_download_url |
-      cut -d\" -f4
-  )
+  release_prefix="https://api.github.com/repos/atsign-foundation/noports/releases/"
+  release_info=$(downloader "$release_prefix$(norm_version $sshnp_version)" - )
+  exitcode=$?
+  if [ $exitcode != 0 ]; then exit $exitcode; fi
+  download_urls=$(echo "$release_info" | grep browser_download_url | cut -d\" -f4)
 
   if [ -z "$download_urls" ]; then
-    echo "Failed to get download url for sshnoports"
+    >&2 echo "Failed to get download url for sshnoports"
     exit 1
   fi
 
-  echo "$download_urls" |
-    grep "$platform_name" | grep "$system_arch" |
-    cut -d\" -f4
+  echo "$download_urls" | grep "$platform_name" |
+    grep "$system_arch" | cut -d\" -f4
 }
 
 download_archive() {
   read -r download_url
   echo "Downloading archive from $download_url"
-  curl -sL "$download_url" -o "$archive_path"
+  downloader "$download_url" "$archive_path"
   if [ ! -f "$archive_path" ]; then
     echo "Failed to download archive"
     exit 1
@@ -368,9 +390,19 @@ download_archive() {
 unpack_archive() {
   case "$archive_ext" in
     zip)
+      if ! check_cmd unzip; then
+        >&2 echo "ERROR: unzip not found"
+        >&2 echo "Please install unzip and make it available on the PATH"
+        exit 1
+      fi
       unzip -qo "$archive_path" -d "$extract_path"
       ;;
     tgz | tar.gz)
+      if ! check_cmd tar; then
+        >&2 echo "ERROR: tar not available"
+        >&2 echo "Please install tar and make it available on the PATH"
+        exit 1
+      fi
       mkdir -p "$extract_path"
       tar -zxf "$archive_path" -C "$extract_path"
       ;;
@@ -653,17 +685,17 @@ device() {
       if ! $no_sudo && is_systemd_available; then
         suggest_sudo
       fi
-      if command -v tmux >/dev/null 2>&1; then
+      if check_cmd tmux; then
         device_install_type="tmux"
       else
-        if ! command -v cron >/dev/null 2>&1; then
-          echo "ERROR: crontab not available"
-          echo "Please install cron and make it available on the PATH"
+        if ! check_cmd cron; then
+          >&2 echo "ERROR: crontab not available"
+          >&2 echo "Please install cron and make it available on the PATH"
           exit 1
         fi
-        if ! command -v nohup >/dev/null 2>&1; then
-          echo "ERROR: nohup not available"
-          echo "Please install nohup and make it available on the PATH"
+        if ! check_cmd nohup; then
+          >&2 echo "ERROR: nohup not available"
+          >&2 echo "Please install nohup and make it available on the PATH"
           exit 1
         fi
         device_install_type="headless"