From 7bab5e6be02f87b29f0a57e48267872fb3c37cf6 Mon Sep 17 00:00:00 2001
From: Robin <boehnrobin@gmail.com>
Date: Sat, 24 Feb 2024 01:34:57 +0100
Subject: [PATCH 1/6] refactored updater

---
 updater.lua | 429 ++++++++++++++++++++++++++--------------------------
 1 file changed, 216 insertions(+), 213 deletions(-)

diff --git a/updater.lua b/updater.lua
index 9588cd2..b8f1600 100644
--- a/updater.lua
+++ b/updater.lua
@@ -1,250 +1,253 @@
 local args = {...}
 local internet=require("internet")
-local text=require("text")
 local filesystem=require("filesystem")
 local unicode=require("unicode")
-local term=require("term")
-local event=require("event")
-local keyboard=require("keyboard")
 
-local repository = "seesberger/PowerManager"
-local repoTargetPath = "/usr/PowerManager/"
-local libTargetPath = "/lib/"
+YES = {"y","yes","Y","Yes","YES"}
+NO = {"n","no","N","No","NO"}
 
-local helpText =        "This updater pulls the git files for installation and application updates.\n"..
-                        "Usage:\n" .. 
-                        "updater <option> - no args: manual update and install\n"..
-                        "  ''       -h    - this help text\n" .. 
-                        "  ''       -a    - automatic update no install\n" .. 
-                        "  ''       -i    - automatic update and install"
+SupportedRemotes = {
+    Github = {
+        BaseUrl = "https://github.com/",
+        Implemented = true
+    },
+    Gitea = {
+        BaseUrl = "https://git.realrobin.io",
+        Implemented = false
+    }
+}
 
-function manualUpdate()
-    print("Manual repo pull...")
-    downloadRepo(repository, repoTargetPath, false)
-end
+Repository = {}
 
-function manualInstall()
-    print("installing shortcut...")
-    os.execute("mv "..repoTargetPath.."shortcut.lua /usr/bin/powerman.lua")
-end
+---default repo to update
+DefaultRepository = {
+    Owner = "seesberger",
+    Name = "PowerManager",
+    ShortName = "powerman",
+    RepoIdentifier = "seesberger/PowerManager",
+    Remote = SupportedRemotes.Github,
+    CurrentBranch = "master",
+    CurrentLocalPath = ""
+}
 
-function automaticUpdate()
-    print("Auto repo pull...")
-    downloadRepo(repository, repoTargetPath, true)
-end
+DefaultTemporaryDownloadPath = "/home/.tmp/git/"
+DefaultInstallationPath = "/usr/"
 
-function automaticInstall()
-    print("downloading GUI-API")
-    downloadDependencies()
-    manualInstall()
-end
-
-function downloadDependencies(automatic)
-    os.execute("wget -f https://github.com/kevinkk525/OC-GUI-API/raw/master/shapes_default.lua /lib/shapes_default.lua")
-    os.execute("wget -f https://github.com/kevinkk525/OC-GUI-API/raw/master/GUI.lua /lib/GUI.lua")
-    os.execute("wget -f https://github.com/kevinkk525/OC-GUI-API/raw/master/term_mod.lua /lib/term_mod.lua")
-    os.execute("wget -f https://github.com/kevinkk525/OC-GUI-API/raw/master/tech_demo.lua /home/GUI_tech_demo.lua")
-end
-
-function downloadRepo(repo, target, automatic)
-
-    if not repo:match("^[%w-.]*/[%w-.]*$") then
-        print('"'..repo..'" does not look like a valid repo identifier.\nShould be <owner>/<reponame>')
-        return
+local function askYesOrNoQuestion(question, expectedTrue, expectedFalse, defaultYesOnEnter)
+    local function checkContains(array,value)
+        for idx, val in array do
+            if value == val then return true
+        end
+        return false
     end
 
-    target=target and ("/"..target:match("^/?(.-)/?$").."/") or "/tmp/"..repo
-    if filesystem.exists(target) then
-        if not filesystem.isDirectory(target) then
-            print("target directory already exists and is not a directory.")
+    if defaultYesOnEnter==true then print(question.." [Y/n]") else print(question.." [y/N]") end
+    while true do
+        local userInput = io.read("l")
+        if checkContains({""}, userInput) then return defaultYesOnEnter end
+        if checkContains(expectedTrue, userInput) then return true end
+        if checkContains(expectedFalse, userInput) then return false end
+        print("Please answer with yes or no. You can also press ENTER to choose the default option.")
+    end
+    end
+end
+
+local function askTextQuestion(question, defaultAnswerOnEnter, allowOnly)
+    local allowedInputsString = ""
+    for idx, entry in allowOnly do allowedInputsString = allowedInputsString..entry end
+    if allowOnly then print(question.." ["..allowedInputsString.."]")
+    else print(question) end
+    local userInput = nil
+    local found = false
+    repeat
+        userInput = io.read("l")
+        if allowOnly then
+            for idx, entry in allowOnly do if entry == userInput then found = true end end
+        else break end
+    until found
+    if userInput == "" then return defaultAnswerOnEnter else return userInput end
+end
+
+--- todo: pcall and catch errors
+local function downloadRepo(repository, autoOverride)
+
+    local function validateRepositoryIdentifier(repository)
+        if not repository.RepoIdentifier:match("^[%w-.]*/[%w-.]*$") then
+            print('"'..repository.RepoIdentifier..'" does not look like a valid repo identifier.\nShould be <owner>/<reponame>')
             return
-        end
-        if filesystem.get(target).isReadOnly() then
-            print("target directory is read-only.")
-            return
-        end
-    else
-        if not filesystem.makeDirectory(target) then
-            print("target directory is read-only")
-            return
-        end
+        end 
     end
 
+    validateRepositoryIdentifier(repository)
 
-
-    -- this isn't acually used, but it is tested and works on decoding the base64 encoded data that github
-    --sends for some queries, leaving it in here for possible future/related use, might be able to pull
-    --and display difs and things like that?
-    local symb="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
-
-    function decode64(text)
-        local val,bits=0,0
-        local output=""
-        for ch in text:gmatch(".") do
-            if symb:find(ch) then
-            --print("ch "..ch.."-> "..(symb:find(ch)-1))
-            val=bit32.lshift(val,6)+symb:find(ch)-1
-            else
-            print(ch.."?")
-            return
-            end
-            bits=bits+6
-            --print("bits : "..bits)
-            --print(string.format("val : 0x%04x",val))
-            if bits>=8 then
-            local och=unicode.char(bit32.rshift(val,bits-8))
-            --print("os<<"..och)
-            --print("& with "..(2^(bits-8)-1))
-            val=bit32.band(val,2^(bits-8)-1)
-            bits=bits-8
-            --print(string.format("val : 0x%04x",val))
-            output=output..och
-            end
-        end
-        return output
-    end
-
-
-
-    local function gitContents(repo, dir)
-        print("fetching contents for "..repo..dir)
-        local url="https://api.github.com/repos/"..repo.."/contents"..dir
-        local result,response=pcall(internet.request,url)
-        local raw=""
-        local files={}
-        local directories={}
-
-        if result then
-            for chunk in response do
-            raw=raw..chunk
-            end
+    local function makeDirIfNotExists(target)
+        if filesystem.exists(target) then
+            if not filesystem.isDirectory(target) then error("target directory already exists and is not a directory.") end
+            if filesystem.get(target).isReadOnly() then error("target directory is read-only.") end
         else
-            error("you've been cut off. Serves you right.")
+            if not filesystem.makeDirectory(target) then error("directory creation failed") end
         end
-
-        response=nil
-        raw=raw:gsub("%[","{"):gsub("%]","}"):gsub("(\".-\"):(.-[,{}])",function(a,b) return "["..a.."]="..b end)
-        local t=load("return "..raw)()
-
-        for i=1,#t do
-            if t[i].type=="dir" then
-            table.insert(directories,dir.."/"..t[i].name)
-
-            local subfiles,subdirs=gitContents(repo,dir.."/"..t[i].name)
-            for i=1,#subfiles do
-                table.insert(files,subfiles[i])
-            end
-            for i=1,#subdirs do
-                table.insert(directories,subdirs[i])
-            end
-            else
-            files[#files+1]=dir.."/"..t[i].name
-            end
-        end
-
-        return files, directories
     end
 
-    local files,dirs=gitContents(repo,"")
+    --- FIXME: If download only mode is enabled, set this to /home. still todo
+    local targetDownloadPath = DefaultTemporaryDownloadPath..repository.RepoIdentifier
+    repository.CurrentLocalPath = targetDownloadPath
+    local success, err = pcall(makeDirIfNotExists, targetDownloadPath)
+    if not success then error("the download failed because of filesystem errors.") end
 
+    local function fetchFilesAndSubdirs(repository, remoteType, dir)
+        dir = dir or "" -- default value, start at root dir
+        if remoteType == SupportedRemotes.Github then
+            print("fetching contents for "..repository.RepoIdentifier..dir)
+            local githubApiUrl="https://api.github.com/repos/"..repository.RepoIdentifier.."/contents"..dir
+            local success,chunks=pcall(internet.request,githubApiUrl)
+            local raw=""
+            local files={}
+            local directories={}
+
+            if success then for chunk in chunks do raw=raw..chunk end
+            else error("you've been cut off. Serves you right.") end
+
+            --- do not question the magic of the outer gods
+            --- turns raw response into t, which has usable fields.
+            raw=raw:gsub("%[","{"):gsub("%]","}"):gsub("(\".-\"):(.-[,{}])",function(a,b) return "["..a.."]="..b end)
+            local t=load("return "..raw)()
+
+            for i=1,#t do
+                if t[i].type=="dir" then
+                table.insert(directories,dir.."/"..t[i].name)
+
+                local subfiles,subdirs=fetchFilesAndSubdirs(repository.RepoIdentifier,dir.."/"..t[i].name)
+                for i=1,#subfiles do
+                    table.insert(files,subfiles[i])
+                end
+                for i=1,#subdirs do
+                    table.insert(directories,subdirs[i])
+                end
+                else
+                files[#files+1]=dir.."/"..t[i].name
+                end
+            end
+
+            return files, directories
+        else error("not Implemented") end
+    end
+
+    --- fetch and make dirs in the target download path recursively
+    local files,dirs=fetchFilesAndSubdirs(repository.RepoIdentifier, "", SupportedRemotes.Github)
     for i=1,#dirs do
-        print("making dir "..target..dirs[i])
-        if filesystem.exists(target..dirs[i]) then
-            if not filesystem.isDirectory(target..dirs[i]) then
-            print("error: directory "..target..dirs[i].." blocked by file with the same name")
-            return
-            end
-        else
-            filesystem.makeDirectory(target..dirs[i])
-        end
+        local success, err = pcall(makeDirIfNotExists, targetDownloadPath..dirs[i])
+        if not success then error(("the download failed because of filesystem errors. %x"):format(err)) end
     end
 
     local replaceMode="ask"
-    if automatic == true then replaceMode = "always" end
-    for i=1,#files do
-        local replace=nil
-        if filesystem.exists(target..files[i]) then
-            if filesystem.isDirectory(target..files[i]) then
-            print("Error: file "..target..files[i].." blocked by directory with same name!")
-            return
-            end
-            if replaceMode=="always" then
-            replace=true
-            elseif replaceMode=="never" then
-            replace=false
-            else
-            print("\nFile "..target..files[i].." already exists.\nReplace with new version?")
-            local response=""
-            while replace==nil do
-                term.write("yes,no,always,skip all[ynAS]: ")
-                local char
-                repeat
-                _,_,char=event.pull("key_down")
-                until not keyboard.isControl(char)
-                char=unicode.char(char)
-                print(char)
-                if char=="A" then
-                replaceMode="always"
-                replace=true
-                char="y"
-                elseif char=="S" then
-                replaceMode="never"
-                replace=false
-                char="n"
-                elseif char:lower()=="y" then
-                replace=true
-                elseif char:lower()=="n" then
-                replace=false
-                else
-                print("invalid response.")
+    if autoOverride == true then replaceMode = "always" end
+
+    local function downloadFiles(files, targetDownloadPath, replaceMode)
+        for i=1,#files do
+            local replace=nil
+            if filesystem.exists(targetDownloadPath..files[i]) then
+                --- FIXME dir löschen statt error
+                if filesystem.isDirectory(targetDownloadPath..files[i]) then error("file "..targetDownloadPath..files[i].." blocked by directory with same name!") end
+                if not replaceMode == "ask" then
+                    replace = (replaceMode=="always")
+                    replace = not (replaceMode=="never")
                 end
-            end
-        end
-        if replace then
-        filesystem.remove(target..files[i])
-        end
-    end
-    if replace~=false then
-        print("downloading "..files[i])
-        local url="https://raw.github.com/"..repo.."/master"..files[i]
-        local result,response=pcall(internet.request,url)
-        if result then
-            local raw=""
-            for chunk in response do
-                raw=raw..chunk
-            end
-            print("writing to "..target..files[i])
-            local file=io.open(target..files[i],"w")
-            file:write(raw)
-            file:close()
+                else print("\nFile "..targetDownloadPath..files[i].." already exists.\nReplace with new version?") end
+                local response=""
+                if replace == nil then
+                    --- FIXME: ggf falsch und buggy
+                    local userInput = askTextQuestion("\nFile "..targetDownloadPath..files[i].." already exists.\nReplace with new version?","n",{"y","n","A","S"})
 
-            else
-            print("failed, skipping")
+                    if userInput=="A" then
+                    replaceMode="always"
+                    userInput="y"
+                    elseif userInput=="S" then
+                    replaceMode="never"
+                    userInput="n"
+                    elseif userInput == "y" then replace=true
+                    elseif userInput == "n" then replace=false
+                    end
+                end
+                if replace then filesystem.remove(targetDownloadPath..files[i]) end
+            if replace or replace == nil then
+                --- TODO @Freddy: Coole Animation hinzufügen
+                print("downloading file "..files[i])
+                local url=repository.Remote.BaseUrl..repository.Name.."/"..repository.CurrentBranch..files[i]
+                local success,response=pcall(internet.request,url)
+                if success then
+                    local raw=""
+                    for chunk in response do
+                        raw=raw..chunk
+                    end
+                    print("writing to "..targetDownloadPath..files[i])
+                    local file=io.open(targetDownloadPath..files[i],"w")
+                    if file then -- might be nil under wierd circumstances
+                        file:write(raw)
+                        file:close()
+                    end
+                else error("a file did not download correctly. aborting") end
             end
         end
     end
+
+    success, err = pcall(downloadFiles, files, targetDownloadPath, replaceMode)
+    if success then print("All files downloaded successfully.") else error(err) end
 end
 
-if #args<1 then
-    print("No Arguments given. Manual process...")
-    manualUpdate()
-    automaticInstall()
-    return
+local function installShortcut(currentRepoPath, shortcutName)
+    print("installing shortcut...")
+    os.execute("mv "..currentRepoPath.."shortcut.lua /usr/bin/"..shortcutName..".lua")
 end
 
-if args[1] == "-h" then
+--- todo: automatic read of dependency list (txt file containing lines with <link> <dst> or somethink like it)
+--- removeme
+local function legacyInstallDependencies(enabled)
+    if enabled==true then
+        os.execute("wget -f https://github.com/kevinkk525/OC-GUI-API/raw/master/shapes_default.lua /lib/shapes_default.lua")
+        os.execute("wget -f https://github.com/kevinkk525/OC-GUI-API/raw/master/GUI.lua /lib/GUI.lua")
+        os.execute("wget -f https://github.com/kevinkk525/OC-GUI-API/raw/master/term_mod.lua /lib/term_mod.lua")
+        os.execute("wget -f https://github.com/kevinkk525/OC-GUI-API/raw/master/tech_demo.lua /home/GUI_tech_demo.lua")
+    end
+end
+
+--- fix legacy shit
+local function runFullInstallTask(repository)
+    --- first, download the actual repo.
+    --- then, find dependencies - if then exist, download and install them
+    --- then, install the actual program
+    legacyInstallDependencies(true) --only for testing while new version not implemented yet
+    print("downloading "..repository.RepoIdentifier)
+    downloadRepo(repository, false) --enable autooverwrite in other situations still todo
+    installShortcut(repository.CurrentLocalPath)
+end
+
+local function printHelpText()
+    local helpText =        "This updater pulls the git files for installation and application updates.\n"..
+    "Usage:\n" ..
+    "updater <option>  - no args: manual update and install\n"..
+    "  '' -h or --help - this help text"
     print(helpText)
-    return
-elseif args[1] == "-a" then
-    automaticUpdate()
-    return
-elseif args[1] == "-i" then
-    automaticUpdate()
-    automaticInstall()
-    return
-else
-    print('"'..args[1]..'" - Bad argument.')
-    print(helpText)
-    return
 end
 
+local function run(cliArgs)
+    if #cliArgs<1 then
+        print("No Arguments given. For help, please check -h or --help")
+        return
+    end
+    if cliArgs[1] == ("-h" or "--help") then
+        printHelpText()
+        return
+    elseif cliArgs[1] == ("--setup-default") then
+        --- ask user about repo
+        Repository = DefaultRepository
+        if askYesOrNoQuestion("Use default config? (github::seesberger/PowerManager)?",YES,NO,true) then runFullInstallTask(Repository) end
+        return
+    else
+        print('"'..cliArgs[1]..'" - Bad argument. Try --help')
+        return
+    print("Program exited.")
+    end
+end
+
+run(args)

From b84450a360b99a219a382e033b2f5bb1e6a60d86 Mon Sep 17 00:00:00 2001
From: Robin <boehnrobin@gmail.com>
Date: Sat, 24 Feb 2024 01:42:22 +0100
Subject: [PATCH 2/6] fix cli args

---
 updater.lua | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/updater.lua b/updater.lua
index b8f1600..fbc245a 100644
--- a/updater.lua
+++ b/updater.lua
@@ -226,7 +226,8 @@ local function printHelpText()
     local helpText =        "This updater pulls the git files for installation and application updates.\n"..
     "Usage:\n" ..
     "updater <option>  - no args: manual update and install\n"..
-    "  '' -h or --help - this help text"
+    "  '' -h or        - this help text"..
+    "  '' -d or        - install default config"
     print(helpText)
 end
 
@@ -235,10 +236,10 @@ local function run(cliArgs)
         print("No Arguments given. For help, please check -h or --help")
         return
     end
-    if cliArgs[1] == ("-h" or "--help") then
+    if cliArgs[1] == "-h" then
         printHelpText()
         return
-    elseif cliArgs[1] == ("--setup-default") then
+    elseif cliArgs[1] == "-d" then
         --- ask user about repo
         Repository = DefaultRepository
         if askYesOrNoQuestion("Use default config? (github::seesberger/PowerManager)?",YES,NO,true) then runFullInstallTask(Repository) end

From cc0aef443482f50a9e9e39be8b987ad11f8d0fd3 Mon Sep 17 00:00:00 2001
From: Robin <boehnrobin@gmail.com>
Date: Sat, 24 Feb 2024 03:09:06 +0100
Subject: [PATCH 3/6] =?UTF-8?q?ende=20f=C3=BCr=20nun?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 updater.lua | 37 ++++++++++++++++---------------------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/updater.lua b/updater.lua
index fbc245a..baf46be 100644
--- a/updater.lua
+++ b/updater.lua
@@ -35,8 +35,8 @@ DefaultInstallationPath = "/usr/"
 
 local function askYesOrNoQuestion(question, expectedTrue, expectedFalse, defaultYesOnEnter)
     local function checkContains(array,value)
-        for idx, val in array do
-            if value == val then return true
+        for idx, val in pairs(array) do
+            if value == val then return true end
         end
         return false
     end
@@ -49,12 +49,11 @@ local function askYesOrNoQuestion(question, expectedTrue, expectedFalse, default
         if checkContains(expectedFalse, userInput) then return false end
         print("Please answer with yes or no. You can also press ENTER to choose the default option.")
     end
-    end
 end
 
 local function askTextQuestion(question, defaultAnswerOnEnter, allowOnly)
     local allowedInputsString = ""
-    for idx, entry in allowOnly do allowedInputsString = allowedInputsString..entry end
+    for idx, entry in pairs(allowOnly) do allowedInputsString = allowedInputsString..entry end
     if allowOnly then print(question.." ["..allowedInputsString.."]")
     else print(question) end
     local userInput = nil
@@ -62,14 +61,14 @@ local function askTextQuestion(question, defaultAnswerOnEnter, allowOnly)
     repeat
         userInput = io.read("l")
         if allowOnly then
-            for idx, entry in allowOnly do if entry == userInput then found = true end end
+            for idx, entry in pairs(allowOnly) do if entry == userInput then found = true end end
         else break end
     until found
     if userInput == "" then return defaultAnswerOnEnter else return userInput end
 end
 
 --- todo: pcall and catch errors
-local function downloadRepo(repository, autoOverride)
+local function downloadRepo(repository, remoteType, autoOverride)
 
     local function validateRepositoryIdentifier(repository)
         if not repository.RepoIdentifier:match("^[%w-.]*/[%w-.]*$") then
@@ -117,7 +116,7 @@ local function downloadRepo(repository, autoOverride)
                 if t[i].type=="dir" then
                 table.insert(directories,dir.."/"..t[i].name)
 
-                local subfiles,subdirs=fetchFilesAndSubdirs(repository.RepoIdentifier,dir.."/"..t[i].name)
+                local subfiles,subdirs=fetchFilesAndSubdirs(repository,SupportedRemotes.Github,dir.."/"..t[i].name)
                 for i=1,#subfiles do
                     table.insert(files,subfiles[i])
                 end
@@ -134,7 +133,7 @@ local function downloadRepo(repository, autoOverride)
     end
 
     --- fetch and make dirs in the target download path recursively
-    local files,dirs=fetchFilesAndSubdirs(repository.RepoIdentifier, "", SupportedRemotes.Github)
+    local files,dirs=fetchFilesAndSubdirs(repository.RepoIdentifier, remoteType, "")
     for i=1,#dirs do
         local success, err = pcall(makeDirIfNotExists, targetDownloadPath..dirs[i])
         if not success then error(("the download failed because of filesystem errors. %x"):format(err)) end
@@ -202,13 +201,11 @@ end
 
 --- todo: automatic read of dependency list (txt file containing lines with <link> <dst> or somethink like it)
 --- removeme
-local function legacyInstallDependencies(enabled)
-    if enabled==true then
-        os.execute("wget -f https://github.com/kevinkk525/OC-GUI-API/raw/master/shapes_default.lua /lib/shapes_default.lua")
-        os.execute("wget -f https://github.com/kevinkk525/OC-GUI-API/raw/master/GUI.lua /lib/GUI.lua")
-        os.execute("wget -f https://github.com/kevinkk525/OC-GUI-API/raw/master/term_mod.lua /lib/term_mod.lua")
-        os.execute("wget -f https://github.com/kevinkk525/OC-GUI-API/raw/master/tech_demo.lua /home/GUI_tech_demo.lua")
-    end
+local function legacyInstallDependencies()
+    os.execute("wget -f https://github.com/kevinkk525/OC-GUI-API/raw/master/shapes_default.lua /lib/shapes_default.lua")
+    os.execute("wget -f https://github.com/kevinkk525/OC-GUI-API/raw/master/GUI.lua /lib/GUI.lua")
+    os.execute("wget -f https://github.com/kevinkk525/OC-GUI-API/raw/master/term_mod.lua /lib/term_mod.lua")
+    os.execute("wget -f https://github.com/kevinkk525/OC-GUI-API/raw/master/tech_demo.lua /home/GUI_tech_demo.lua")
 end
 
 --- fix legacy shit
@@ -216,9 +213,9 @@ local function runFullInstallTask(repository)
     --- first, download the actual repo.
     --- then, find dependencies - if then exist, download and install them
     --- then, install the actual program
-    legacyInstallDependencies(true) --only for testing while new version not implemented yet
+    legacyInstallDependencies() --only for testing while new version not implemented yet
     print("downloading "..repository.RepoIdentifier)
-    downloadRepo(repository, false) --enable autooverwrite in other situations still todo
+    downloadRepo(repository, repository.Remote, false) --enable auto-overwrite in other situations still todo
     installShortcut(repository.CurrentLocalPath)
 end
 
@@ -226,7 +223,7 @@ local function printHelpText()
     local helpText =        "This updater pulls the git files for installation and application updates.\n"..
     "Usage:\n" ..
     "updater <option>  - no args: manual update and install\n"..
-    "  '' -h or        - this help text"..
+    "  '' -h or        - this help text\n"..
     "  '' -d or        - install default config"
     print(helpText)
 end
@@ -242,11 +239,9 @@ local function run(cliArgs)
     elseif cliArgs[1] == "-d" then
         --- ask user about repo
         Repository = DefaultRepository
-        if askYesOrNoQuestion("Use default config? (github::seesberger/PowerManager)?",YES,NO,true) then runFullInstallTask(Repository) end
-        return
+        if askYesOrNoQuestion("Use default config? (github::seesberger/PowerManager)?",YES,NO,true) == true then runFullInstallTask(DefaultRepository) end
     else
         print('"'..cliArgs[1]..'" - Bad argument. Try --help')
-        return
     print("Program exited.")
     end
 end

From 6165808cc4d9b5a40314dbe32828a582aca0e64b Mon Sep 17 00:00:00 2001
From: Robin <boehnrobin@gmail.com>
Date: Sat, 24 Feb 2024 03:12:56 +0100
Subject: [PATCH 4/6] =?UTF-8?q?eine=20weitere,=20sehr=20sehr=20wichtige=20?=
 =?UTF-8?q?=C3=84nderung.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 updater.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/updater.lua b/updater.lua
index baf46be..8b6edd9 100644
--- a/updater.lua
+++ b/updater.lua
@@ -74,7 +74,7 @@ local function downloadRepo(repository, remoteType, autoOverride)
         if not repository.RepoIdentifier:match("^[%w-.]*/[%w-.]*$") then
             print('"'..repository.RepoIdentifier..'" does not look like a valid repo identifier.\nShould be <owner>/<reponame>')
             return
-        end 
+        end
     end
 
     validateRepositoryIdentifier(repository)

From 9253f00eef12437c4088c02ebd33f5079cf58c5e Mon Sep 17 00:00:00 2001
From: Robin <boehnrobin@gmail.com>
Date: Mon, 26 Feb 2024 02:25:25 +0100
Subject: [PATCH 5/6] funktioniert nimmer aber heut is gut

---
 PowerManager.lua            |   5 +-
 updater.lua => git-tool.lua | 164 ++++++++++++++++++++++++++----------
 2 files changed, 123 insertions(+), 46 deletions(-)
 rename updater.lua => git-tool.lua (57%)

diff --git a/PowerManager.lua b/PowerManager.lua
index 4419f0e..d5749dc 100644
--- a/PowerManager.lua
+++ b/PowerManager.lua
@@ -6,20 +6,19 @@ local event = require( "event" )
 
 local splashText = "Stromanzeige - Ultimate ROG RGB LED Edition"
 local frameTitle = "Power Monitor - Klicken zum Beenden"
- 
+
 local oldW, oldH = gpu.getResolution()
 local newW = 160
 local newH = 50
 local numberOfPanels = 2
 local panelWidth = (newW / numberOfPanels)
 gpu.setResolution(newW, newH)
- 
+
 function clearScreen()
   local w,h = gpu.getResolution()
   drawLine(1, 1, w, h, 0x000000)
 end
 
-
 function drawLine(startX, startY, stopX, stopY, colorOfLine)
   local oldColor = gpu.getBackground(false)
   gpu.setBackground(colorOfLine, false)
diff --git a/updater.lua b/git-tool.lua
similarity index 57%
rename from updater.lua
rename to git-tool.lua
index 8b6edd9..5d17b2c 100644
--- a/updater.lua
+++ b/git-tool.lua
@@ -9,6 +9,7 @@ NO = {"n","no","N","No","NO"}
 SupportedRemotes = {
     Github = {
         BaseUrl = "https://github.com/",
+        RawApiUrl = "https://raw.githubusercontent.com/",
         Implemented = true
     },
     Gitea = {
@@ -17,7 +18,15 @@ SupportedRemotes = {
     }
 }
 
-Repository = {}
+EmptyRepository = {
+    Owner = nil,
+    Name = nil,
+    ShortName = nil,
+    RepoIdentifier = nil,
+    Remote = nil,
+    CurrentBranch = nil,
+    CurrentLocalPath = nil
+}
 
 ---default repo to update
 DefaultRepository = {
@@ -67,8 +76,17 @@ local function askTextQuestion(question, defaultAnswerOnEnter, allowOnly)
     if userInput == "" then return defaultAnswerOnEnter else return userInput end
 end
 
+local function makeDirIfNotExists(target)
+    if filesystem.exists(target) then
+        if not filesystem.isDirectory(target) then error("target directory already exists and is not a directory.") end
+        if filesystem.get(target).isReadOnly() then error("target directory is read-only.") end
+    else
+        if not filesystem.makeDirectory(target) then error("directory creation failed") end
+    end
+end
+
 --- todo: pcall and catch errors
-local function downloadRepo(repository, remoteType, autoOverride)
+local function downloadRepo(repository, remote, autoOverride)
 
     local function validateRepositoryIdentifier(repository)
         if not repository.RepoIdentifier:match("^[%w-.]*/[%w-.]*$") then
@@ -79,24 +97,15 @@ local function downloadRepo(repository, remoteType, autoOverride)
 
     validateRepositoryIdentifier(repository)
 
-    local function makeDirIfNotExists(target)
-        if filesystem.exists(target) then
-            if not filesystem.isDirectory(target) then error("target directory already exists and is not a directory.") end
-            if filesystem.get(target).isReadOnly() then error("target directory is read-only.") end
-        else
-            if not filesystem.makeDirectory(target) then error("directory creation failed") end
-        end
-    end
-
     --- FIXME: If download only mode is enabled, set this to /home. still todo
     local targetDownloadPath = DefaultTemporaryDownloadPath..repository.RepoIdentifier
-    repository.CurrentLocalPath = targetDownloadPath
-    local success, err = pcall(makeDirIfNotExists, targetDownloadPath)
+    repository.CurrentLocalPath = targetDownloadPath.."/"
+    local success, res = pcall(makeDirIfNotExists, targetDownloadPath)
     if not success then error("the download failed because of filesystem errors.") end
 
-    local function fetchFilesAndSubdirs(repository, remoteType, dir)
+    local function fetchFilesAndSubdirs(repository, remote, dir)
         dir = dir or "" -- default value, start at root dir
-        if remoteType == SupportedRemotes.Github then
+        if remote == SupportedRemotes.Github then
             print("fetching contents for "..repository.RepoIdentifier..dir)
             local githubApiUrl="https://api.github.com/repos/"..repository.RepoIdentifier.."/contents"..dir
             local success,chunks=pcall(internet.request,githubApiUrl)
@@ -116,7 +125,7 @@ local function downloadRepo(repository, remoteType, autoOverride)
                 if t[i].type=="dir" then
                 table.insert(directories,dir.."/"..t[i].name)
 
-                local subfiles,subdirs=fetchFilesAndSubdirs(repository,SupportedRemotes.Github,dir.."/"..t[i].name)
+                local subfiles,subdirs=fetchFilesAndSubdirs(repository,remote,dir.."/"..t[i].name)
                 for i=1,#subfiles do
                     table.insert(files,subfiles[i])
                 end
@@ -133,7 +142,7 @@ local function downloadRepo(repository, remoteType, autoOverride)
     end
 
     --- fetch and make dirs in the target download path recursively
-    local files,dirs=fetchFilesAndSubdirs(repository.RepoIdentifier, remoteType, "")
+    local files,dirs=fetchFilesAndSubdirs(repository, repository.Remote, "")
     for i=1,#dirs do
         local success, err = pcall(makeDirIfNotExists, targetDownloadPath..dirs[i])
         if not success then error(("the download failed because of filesystem errors. %x"):format(err)) end
@@ -143,80 +152,141 @@ local function downloadRepo(repository, remoteType, autoOverride)
     if autoOverride == true then replaceMode = "always" end
 
     local function downloadFiles(files, targetDownloadPath, replaceMode)
+        local replace=nil
+        local downloadedFileTargets = {}
         for i=1,#files do
-            local replace=nil
-            if filesystem.exists(targetDownloadPath..files[i]) then
+            if replaceMode == "always" then replace = true end
+            local fileExists = filesystem.exists(targetDownloadPath..files[i])
+            if fileExists then
                 --- FIXME dir löschen statt error
                 if filesystem.isDirectory(targetDownloadPath..files[i]) then error("file "..targetDownloadPath..files[i].." blocked by directory with same name!") end
-                if not replaceMode == "ask" then
-                    replace = (replaceMode=="always")
-                    replace = not (replaceMode=="never")
-                end
-                else print("\nFile "..targetDownloadPath..files[i].." already exists.\nReplace with new version?") end
-                local response=""
+                
                 if replace == nil then
-                    --- FIXME: ggf falsch und buggy
                     local userInput = askTextQuestion("\nFile "..targetDownloadPath..files[i].." already exists.\nReplace with new version?","n",{"y","n","A","S"})
 
+                    --- FIXME: replaceMode ist broken. A wird immer wieder gefragt.
                     if userInput=="A" then
                     replaceMode="always"
                     userInput="y"
                     elseif userInput=="S" then
                     replaceMode="never"
                     userInput="n"
-                    elseif userInput == "y" then replace=true
-                    elseif userInput == "n" then replace=false
                     end
+                    if userInput == "y" then replace=true end
+                    if userInput == "n" then replace=false end
                 end
-                if replace then filesystem.remove(targetDownloadPath..files[i]) end
-            if replace or replace == nil then
+            end
+            if fileExists and replace then filesystem.remove(targetDownloadPath..files[i]) end
+            if replace or (replace == nil) then
                 --- TODO @Freddy: Coole Animation hinzufügen
                 print("downloading file "..files[i])
-                local url=repository.Remote.BaseUrl..repository.Name.."/"..repository.CurrentBranch..files[i]
+                --- HACK: RawApiUrl is for using Github Raw API. may have to be patched for Gitea Support
+                local url=repository.Remote.RawApiUrl..repository.RepoIdentifier.."/"..repository.CurrentBranch..files[i]
                 local success,response=pcall(internet.request,url)
                 if success then
                     local raw=""
                     for chunk in response do
                         raw=raw..chunk
                     end
-                    print("writing to "..targetDownloadPath..files[i])
-                    local file=io.open(targetDownloadPath..files[i],"w")
+                    local absoluteDownloadFileTargetPath = targetDownloadPath..files[i]
+                    print("writing to "..absoluteDownloadFileTargetPath)
+                    local file=io.open(absoluteDownloadFileTargetPath,"w")
                     if file then -- might be nil under wierd circumstances
                         file:write(raw)
                         file:close()
                     end
+                    table.insert(downloadedFileTargets, files[i])
                 else error("a file did not download correctly. aborting") end
-            end
+            else error("file not removed, but installation was cancelled - This might result in a broken install.") end
         end
+        --- return list of all abolute paths the files were downloaded to
+        return downloadedFileTargets
     end
 
-    success, err = pcall(downloadFiles, files, targetDownloadPath, replaceMode)
-    if success then print("All files downloaded successfully.") else error(err) end
+    success, res = pcall(downloadFiles, files, targetDownloadPath, replaceMode)
+    if success then print("All files downloaded successfully.") return res else error(res) end
+
 end
 
-local function installShortcut(currentRepoPath, shortcutName)
+local function installFiles(downloadedFiles, downloadTargetDir, installTargetDir)
+    local installedFiles = {}
+    
+    --- FIXME: ask user about replacing files.
+    local replace = true
+    makeDirIfNotExists(installTargetDir)
+    for idx, file in pairs(downloadedFiles) do
+        print(idx..": Installing File "..downloadTargetDir..file:sub(2,-1).." to target directory "..installTargetDir..file)
+        local fileExists = filesystem.exists(installTargetDir..file)
+        if fileExists and replace then filesystem.remove(installTargetDir..file) end
+        if replace or (replace == nil) then
+            --- TODO @Freddy: Coole Animation hinzufügen
+            os.execute("cp "..downloadTargetDir..file:sub(2,-1).." "..installTargetDir..file)
+            table.insert(installedFiles, installTargetDir..file)
+        else error("file not removed, but installation was cancelled - This might result in a broken install.") end
+    end
+    return installedFiles
+end
+
+local function installShortcut(currentRepoPath, shortcutName, targetDir)
     print("installing shortcut...")
-    os.execute("mv "..currentRepoPath.."shortcut.lua /usr/bin/"..shortcutName..".lua")
+    makeDirIfNotExists(targetDir)
+    os.execute("mv "..currentRepoPath.."shortcut.lua "..targetDir..shortcutName..".lua")
 end
 
 --- todo: automatic read of dependency list (txt file containing lines with <link> <dst> or somethink like it)
 --- removeme
 local function legacyInstallDependencies()
+    print("Legacy Mode: Installing hardcoded dependencies...")
     os.execute("wget -f https://github.com/kevinkk525/OC-GUI-API/raw/master/shapes_default.lua /lib/shapes_default.lua")
     os.execute("wget -f https://github.com/kevinkk525/OC-GUI-API/raw/master/GUI.lua /lib/GUI.lua")
     os.execute("wget -f https://github.com/kevinkk525/OC-GUI-API/raw/master/term_mod.lua /lib/term_mod.lua")
     os.execute("wget -f https://github.com/kevinkk525/OC-GUI-API/raw/master/tech_demo.lua /home/GUI_tech_demo.lua")
 end
 
+local function removeDownloads(downloadTargetDir, downloadedFiles)
+    for idx, file in pairs(downloadedFiles) do
+        file = file:sub(2,-1) --- get "file" from previous string "/file"
+        print(idx..": Removing temporary file "..downloadTargetDir..file)
+        local fileExists = filesystem.exists(downloadTargetDir..file)
+        if fileExists then filesystem.remove(downloadTargetDir..file) end
+    end
+    print("cleaned temporary files.")
+end
+
+local function createManifest(installedFiles, installedShortcuts, manifestTarget, repoName)
+    makeDirIfNotExists(manifestTarget)
+    local manifest = ""
+    for idx, file in pairs(installedFiles) do
+        manifest = manifest..file.."\n"
+    end
+    for idy, shortcut in pairs(installedShortcuts) do
+        manifest = manifest..shortcut.."\n"
+    end
+    print("writing manifest to "..manifestTarget.."/"..repoName)
+    local file=io.open(manifestTarget.."/"..repoName,"w")
+    if file then -- might be nil under wierd circumstances
+        file:write(manifest)
+        file:close()
+    end
+end
+
 --- fix legacy shit
-local function runFullInstallTask(repository)
+local function runFullInstallTask(repository, shortcutName)
     --- first, download the actual repo.
     --- then, find dependencies - if then exist, download and install them
     --- then, install the actual program
+    local installTargetDir  = "/usr/"..repository.Name
+    local shortcutTargetDir = "/usr/bin/"
+    local downloadTargetDir = DefaultTemporaryDownloadPath
+    local manifestTarget = "/etc/manifest/"
+
     legacyInstallDependencies() --only for testing while new version not implemented yet
     print("downloading "..repository.RepoIdentifier)
-    downloadRepo(repository, repository.Remote, false) --enable auto-overwrite in other situations still todo
-    installShortcut(repository.CurrentLocalPath)
+    local downloadedFiles = downloadRepo(repository, repository.Remote, false) --enable auto-overwrite in other situations still todo
+    local installedFiles = installFiles(downloadedFiles, downloadTargetDir, installTargetDir)
+    local installedShortcuts = installShortcut(repository.CurrentLocalPath, shortcutName, shortcutTargetDir)
+    removeDownloads(downloadTargetDir, downloadedFiles)
+    createManifest(installedFiles, installedShortcuts, manifestTarget, repository.Name)
 end
 
 local function printHelpText()
@@ -229,6 +299,9 @@ local function printHelpText()
 end
 
 local function run(cliArgs)
+    local repo = EmptyRepository
+    local shortcutName = nil
+
     if #cliArgs<1 then
         print("No Arguments given. For help, please check -h or --help")
         return
@@ -238,8 +311,13 @@ local function run(cliArgs)
         return
     elseif cliArgs[1] == "-d" then
         --- ask user about repo
-        Repository = DefaultRepository
-        if askYesOrNoQuestion("Use default config? (github::seesberger/PowerManager)?",YES,NO,true) == true then runFullInstallTask(DefaultRepository) end
+        if askYesOrNoQuestion("Use default config? (github::seesberger/PowerManager)?",YES,NO,true) == true then
+            repo = DefaultRepository
+            --- ask user about shortcutname
+            if askYesOrNoQuestion("Use default shortcut name \"powerman\"?",YES,NO,true) then shortcutName = "powerman" end
+            runFullInstallTask(repo, shortcutName)
+        --- TODO non-default config
+        else print("other things not implemented yet") end
     else
         print('"'..cliArgs[1]..'" - Bad argument. Try --help')
     print("Program exited.")

From 6d33f3eb85e82b6a8e7813fc166219e2884faf9c Mon Sep 17 00:00:00 2001
From: Robin <boehnrobin@gmail.com>
Date: Mon, 26 Feb 2024 20:37:34 +0100
Subject: [PATCH 6/6] -d now more or less complete

---
 git-tool.lua | 38 +++++++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/git-tool.lua b/git-tool.lua
index 5d17b2c..f432860 100644
--- a/git-tool.lua
+++ b/git-tool.lua
@@ -86,7 +86,7 @@ local function makeDirIfNotExists(target)
 end
 
 --- todo: pcall and catch errors
-local function downloadRepo(repository, remote, autoOverride)
+local function downloadRepo(repository, remote, autoOverride, targetDownloadPath)
 
     local function validateRepositoryIdentifier(repository)
         if not repository.RepoIdentifier:match("^[%w-.]*/[%w-.]*$") then
@@ -98,7 +98,6 @@ local function downloadRepo(repository, remote, autoOverride)
     validateRepositoryIdentifier(repository)
 
     --- FIXME: If download only mode is enabled, set this to /home. still todo
-    local targetDownloadPath = DefaultTemporaryDownloadPath..repository.RepoIdentifier
     repository.CurrentLocalPath = targetDownloadPath.."/"
     local success, res = pcall(makeDirIfNotExists, targetDownloadPath)
     if not success then error("the download failed because of filesystem errors.") end
@@ -205,7 +204,6 @@ local function downloadRepo(repository, remote, autoOverride)
 
     success, res = pcall(downloadFiles, files, targetDownloadPath, replaceMode)
     if success then print("All files downloaded successfully.") return res else error(res) end
-
 end
 
 local function installFiles(downloadedFiles, downloadTargetDir, installTargetDir)
@@ -215,12 +213,13 @@ local function installFiles(downloadedFiles, downloadTargetDir, installTargetDir
     local replace = true
     makeDirIfNotExists(installTargetDir)
     for idx, file in pairs(downloadedFiles) do
-        print(idx..": Installing File "..downloadTargetDir..file:sub(2,-1).." to target directory "..installTargetDir..file)
+        local absoluteDownloadFilePath = downloadTargetDir.."/"..file:sub(2,-1)
+        print(idx..": Installing File "..absoluteDownloadFilePath.." to target directory "..installTargetDir..file)
         local fileExists = filesystem.exists(installTargetDir..file)
         if fileExists and replace then filesystem.remove(installTargetDir..file) end
         if replace or (replace == nil) then
             --- TODO @Freddy: Coole Animation hinzufügen
-            os.execute("cp "..downloadTargetDir..file:sub(2,-1).." "..installTargetDir..file)
+            os.execute("cp "..absoluteDownloadFilePath.." "..installTargetDir..file)
             table.insert(installedFiles, installTargetDir..file)
         else error("file not removed, but installation was cancelled - This might result in a broken install.") end
     end
@@ -230,7 +229,9 @@ end
 local function installShortcut(currentRepoPath, shortcutName, targetDir)
     print("installing shortcut...")
     makeDirIfNotExists(targetDir)
-    os.execute("mv "..currentRepoPath.."shortcut.lua "..targetDir..shortcutName..".lua")
+    local shortcutInstallTarget = currentRepoPath.."shortcut.lua "..targetDir..shortcutName..".lua"
+    os.execute("mv "..shortcutInstallTarget)
+    return {shortcutInstallTarget}
 end
 
 --- todo: automatic read of dependency list (txt file containing lines with <link> <dst> or somethink like it)
@@ -241,6 +242,8 @@ local function legacyInstallDependencies()
     os.execute("wget -f https://github.com/kevinkk525/OC-GUI-API/raw/master/GUI.lua /lib/GUI.lua")
     os.execute("wget -f https://github.com/kevinkk525/OC-GUI-API/raw/master/term_mod.lua /lib/term_mod.lua")
     os.execute("wget -f https://github.com/kevinkk525/OC-GUI-API/raw/master/tech_demo.lua /home/GUI_tech_demo.lua")
+    local installedDependencies = {"/lib/shapes_default.lua", "/lib/GUI.lua", "/lib/term_mod.lua", "/home/GUI_tech_demo.lua"}
+    return installedDependencies
 end
 
 local function removeDownloads(downloadTargetDir, downloadedFiles)
@@ -253,7 +256,11 @@ local function removeDownloads(downloadTargetDir, downloadedFiles)
     print("cleaned temporary files.")
 end
 
-local function createManifest(installedFiles, installedShortcuts, manifestTarget, repoName)
+local function removeFilesViaManifest(manifestTarget)
+    --- todo
+end
+
+local function createManifest(installedDependencies, installedFiles, installedShortcuts, manifestTarget, repoName)
     makeDirIfNotExists(manifestTarget)
     local manifest = ""
     for idx, file in pairs(installedFiles) do
@@ -262,8 +269,11 @@ local function createManifest(installedFiles, installedShortcuts, manifestTarget
     for idy, shortcut in pairs(installedShortcuts) do
         manifest = manifest..shortcut.."\n"
     end
-    print("writing manifest to "..manifestTarget.."/"..repoName)
-    local file=io.open(manifestTarget.."/"..repoName,"w")
+    for idz, dependency in pairs(installedDependencies) do
+        manifest = manifest..dependency.."\n"
+    end
+    print("writing manifest to "..manifestTarget..repoName)
+    local file=io.open(manifestTarget..repoName,"w")
     if file then -- might be nil under wierd circumstances
         file:write(manifest)
         file:close()
@@ -277,16 +287,18 @@ local function runFullInstallTask(repository, shortcutName)
     --- then, install the actual program
     local installTargetDir  = "/usr/"..repository.Name
     local shortcutTargetDir = "/usr/bin/"
-    local downloadTargetDir = DefaultTemporaryDownloadPath
+    local downloadTargetDir = DefaultTemporaryDownloadPath..repository.RepoIdentifier
     local manifestTarget = "/etc/manifest/"
 
-    legacyInstallDependencies() --only for testing while new version not implemented yet
+    local installedDependencies = legacyInstallDependencies() --only for testing while new version not implemented yet
     print("downloading "..repository.RepoIdentifier)
-    local downloadedFiles = downloadRepo(repository, repository.Remote, false) --enable auto-overwrite in other situations still todo
+    local downloadedFiles = downloadRepo(repository, repository.Remote, false, downloadTargetDir) --enable auto-overwrite in other situations still todo
     local installedFiles = installFiles(downloadedFiles, downloadTargetDir, installTargetDir)
     local installedShortcuts = installShortcut(repository.CurrentLocalPath, shortcutName, shortcutTargetDir)
+
+    --- remove temporary files and create manifest for later uninstall
     removeDownloads(downloadTargetDir, downloadedFiles)
-    createManifest(installedFiles, installedShortcuts, manifestTarget, repository.Name)
+    createManifest(installedDependencies, installedFiles, installedShortcuts, manifestTarget, repository.Name)
 end
 
 local function printHelpText()