Explorar o código

fix _date2time

neil hai 1 ano
pai
achega
f4315e2c6f
Modificáronse 2 ficheiros con 6 adicións e 2 borrados
  1. 2 2
      .github/workflows/DNS.yml
  2. 4 0
      acme.sh

+ 2 - 2
.github/workflows/DNS.yml

@@ -465,7 +465,7 @@ jobs:
 
   Omnios:
     runs-on: ubuntu-latest
-    needs: DragonFlyBSD
+    needs: Solaris
     env:
       TEST_DNS : ${{ secrets.TEST_DNS }}
       TestingDomain: ${{ secrets.TestingDomain }}
@@ -491,7 +491,7 @@ jobs:
       with:
         envs: 'TEST_DNS TestingDomain TEST_DNS_NO_WILDCARD TEST_DNS_NO_SUBDOMAIN TEST_DNS_SLEEP CASE TEST_LOCAL DEBUG http_proxy https_proxy HTTPS_INSECURE TokenName1 TokenName2 TokenName3 TokenName4 TokenName5 ${{ secrets.TokenName1}} ${{ secrets.TokenName2}} ${{ secrets.TokenName3}} ${{ secrets.TokenName4}} ${{ secrets.TokenName5}}'
         copyback: false
-        prepare: pkgutil -y -i socat
+        prepare: pkg install socat
         run: |
           pkg set-mediator -v -I [email protected] openssl
           export PATH=/usr/gnu/bin:$PATH

+ 4 - 0
acme.sh

@@ -1795,6 +1795,10 @@ _date2time() {
   if date -u -j -f "%Y-%m-%d %H:%M:%S" "$(echo "$1" | tr -d "Z" | tr "T" ' ')" +"%s" 2>/dev/null; then
     return
   fi
+  #Omnios
+  if da="$(echo "$1" | tr -d "Z" | tr "T" ' ')" perl -MTime::Piece -e 'print Time::Piece->strptime($ENV{da}, "%Y-%m-%d %H:%M:%S")->epoch, "\n";' 2>/dev/null; then
+    return
+  fi
   _err "Can not parse _date2time $1"
   return 1
 }