Fix up some time stuff.

3 files changed, 4 insertions, 11 deletions

diff --git a/apt-panopticon-report-email-web.lua b/apt-panopticon-report-email-web.lua
index 5598515..a08b901 100755
--- a/apt-panopticon-report-email-web.lua
+++ b/apt-panopticon-report-email-web.lua
@@ -608,7 +608,7 @@ if nil == web then C("opening mirrors file - " .. e) else
                 "You can get the cgp graphing <a href='https://sledjhamr.org/cgit/apt-panopticon_cgp/about/'>source code here (main repo)</a>" .. 
                 "and <a href='https://git.devuan.org/onefang/apt-panopticon_cgp'>here (Devuan repo)</a>.</p>\n"
                 )
-    local whn = APT.exe('TZ="GMT" ls -l1 --time-style="+%s" results/stamp | cut -d " " -f 6-6'):Do().result:sub(2, -2)
+    local whn = APT.exe('TZ="GMT" ls -dl1 --time-style="+%s" results/stamp | cut -d " " -f 6-6'):Do().result:sub(2, -2)
     web:write(  "<p>This run took " .. (os.time() - tonumber("0" .. whn)) .. " seconds.</p>" ..
                 "\n</body></html>\n")
     web:close()
diff --git a/apt-panopticon-update-data.lua b/apt-panopticon-update-data.lua
index 105a1c7..9d7e1ff 100755
--- a/apt-panopticon-update-data.lua
+++ b/apt-panopticon-update-data.lua
@@ -50,7 +50,7 @@ local files = io.popen('ls -1 results_*/results_*.tar.xz 2>/dev/null; ls -1 resu
 for l in files:lines() do
     local lsub = l:sub(1, -8)
 
-    local dt = os.date('!%s', os.time{year = l:sub(-23, -20), month = l:sub(-18, -17), day = l:sub(-15, -14), hour = l:sub(-12, -11), minute = l:sub(-9, -8)}) - (60 * 60)
+    local dt = os.date('!%s', os.time{year = l:sub(-23, -20), month = l:sub(-18, -17), day = l:sub(-15, -14), hour = l:sub(-12, -11), min = l:sub(-9, -8)}) - (60 * 60)
     if dt < oldest then oldest = dt; print('\nOldest time is ' .. oldest) end
 
     if -1 < APT.verbosity then io.stdout:write('\r' .. 'tar -xf ' .. l);  io.stdout:flush() end
@@ -106,12 +106,7 @@ local files = io.popen('ls -d1 results_*')
 for l in files:lines() do
     if ('results_old' ~= l) and ('.tar.xz' ~= l:sub(25, -1)) then
         if APT.checkFile(l .. '/stamp') then
---          local status, whn = APT.execute('TZ="GMT" ls -d1 --time-style="+%s" ' .. l .. ' | cut -d " " -f 6-6')
-            local whn = APT.exe('TZ="GMT" ls -d1 --time-style="+%s" ' .. l .. ' | cut -d " " -f 6-6'):Do()
-            whn = whn:sub(2, -2)
---          local status, new = APT.execute('TZ="GMT" date -d "' .. whn:sub(9, 18) .. ' ' .. whn:sub(20, 21) .. ':' .. whn:sub(23, 24) .. '" "+%s"')
-            local new = APT.exe('TZ="GMT" date -d "' .. whn:sub(9, 18) .. ' ' .. whn:sub(20, 21) .. ':' .. whn:sub(23, 24) .. '" "+%s"'):Do()
-            APT.now = tonumber("0" .. new:sub(2, -2))
+            APT.now = os.date('!%s', os.time{year = l:sub(9, 12), month = l:sub(14, 15), day = l:sub(17, 18), hour = l:sub(20, 21), min = l:sub(23, 24)})
             if 0 ~= APT.now then
                 if APT.checkFile(l .. '/mirrors.lua') then
                 if -1 < APT.verbosity then io.stdout:write('\r' .. l .. ' -> ' .. APT.now);  io.stdout:flush() end
diff --git a/apt-panopticon.lua b/apt-panopticon.lua
index 675754d..7ef300c 100755
--- a/apt-panopticon.lua
+++ b/apt-panopticon.lua
@@ -1078,9 +1078,7 @@ else
         :And('rm -fr ' .. adt):noErr():fork()
     end
     local dt = os.date('!%F-%H-%M')
-    local fodt = io.popen('TZ="GMT" date -r results/stamp +%F-%H-%M 2>/dev/null', 'r')
-    local odt = fodt:read('*l')
-    fodt:close()
+    local odt = APT.exe('TZ="GMT" date -r results/stamp +%F-%H-%M 2>/dev/null', 'r').result:sub(2, -2)
     if nil ~= odt then os.execute('                               rm -f results_old; ln -s results_' .. odt .. ' results_old 2>/dev/null') end
     if nil ~= dt  then os.execute('mkdir -p results_' .. dt .. '; rm -f results;     ln -s results_' .. dt  .. ' results     2>/dev/null') end
     os.execute('if [ -f results/stamp ]; then mv results/stamp results/stamp.old; else touch results/stamp.old -t 199901010000; fi;  touch results/stamp')