Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleaning #458

Merged
merged 12 commits into from
Nov 1, 2023
Merged

Cleaning #458

merged 12 commits into from
Nov 1, 2023

Conversation

Romanitho
Copy link
Owner

Proposed Changes

  • Cleaning things up

@github-actions
Copy link
Contributor

github-actions bot commented Oct 30, 2023

🦙 MegaLinter status: ⚠️ WARNING

Descriptor Linter Files Fixed Errors Elapsed time
⚠️ COPYPASTE jscpd yes 7 2.24s
⚠️ MARKDOWN markdownlint 1 1 4 1.04s
✅ MARKDOWN markdown-link-check 1 0 8.75s
✅ MARKDOWN markdown-table-formatter 1 1 0 0.31s
✅ POWERSHELL powershell 3 0 6.02s
✅ POWERSHELL powershell_formatter 3 0 4.16s
⚠️ REPOSITORY checkov yes 1 13.32s
⚠️ REPOSITORY devskim yes 4 2.07s
✅ REPOSITORY dustilock yes no 0.04s
✅ REPOSITORY gitleaks yes no 0.87s
⚠️ REPOSITORY git_diff yes 1 0.01s
✅ REPOSITORY grype yes no 12.58s
✅ REPOSITORY kics yes no 31.61s
✅ REPOSITORY secretlint yes no 1.0s
✅ REPOSITORY syft yes no 0.31s
✅ REPOSITORY trivy yes no 4.62s
✅ REPOSITORY trivy-sbom yes no 1.29s
⚠️ REPOSITORY trufflehog yes 1 5.74s
⚠️ SPELL cspell 5 71 4.84s
✅ SPELL lychee 1 0 1.85s

See detailed report in MegaLinter reports
Set VALIDATE_ALL_CODEBASE: true in mega-linter.yml to validate all sources, not only the diff

MegaLinter is graciously provided by OX Security

@Romanitho
Copy link
Owner Author

@FaserF any idea why MegaLinter cannot create the PR ?
image

@Romanitho Romanitho changed the title Starting a bit of cleaning Cleaning Oct 30, 2023
Added regex in case Microsoft changes the Winget -v output
@Romanitho
Copy link
Owner Author

I think first cleaning part is done

@Romanitho Romanitho marked this pull request as ready for review October 31, 2023 12:13
@FaserF
Copy link
Contributor

FaserF commented Oct 31, 2023

@FaserF any idea why MegaLinter cannot create the PR ? image

I will have a look into it

}
}
#Else, only copy the "included_apps.txt" list if not existing in WAU
elseif (Test-Path "$WAUinstallPath\included_apps.txt") {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(!(Test-Path "$WAUinstallPath\included_apps.txt")) maybe.. ..sorry for my curiosity 🤪

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're perfect... my favourite supervisor dinosaur 🦕 😍
Thanks again for reviewing and pointing out my mistakes.

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Romanitho Romanitho merged commit 0c8f3f1 into main Nov 1, 2023
2 of 3 checks passed
@Romanitho Romanitho deleted the Cleaning branch November 1, 2023 12:53
@KnifMelti
Copy link
Contributor

Could we have a Return $True or Return $False (if WinGet got updated or not) from Update-WinGet.ps1 it would be nice!
In that way one could from _WAU-mods.ps1 (Exit 1 to Re-run WAU from this script!) restart with the new WinGet

            #Test if _WAU-mods.ps1 exist: Mods for WAU (if Network is active/any Winget is installed/running as SYSTEM)
            $Mods = "$WorkingDir\mods"
            if (Test-Path "$Mods\_WAU-mods.ps1") {
                Write-ToLog "Running Mods for WAU..." "Yellow"
                & "$Mods\_WAU-mods.ps1"
                $ModsExitCode = $LASTEXITCODE
                #If _WAU-mods.ps1 has ExitCode 1 - Re-run WAU
                if ($ModsExitCode -eq 1) {
                    Write-ToLog "Re-run WAU"
                    Start-Process powershell -ArgumentList "-NoProfile -ExecutionPolicy Bypass -Command `"$WorkingDir\winget-upgrade.ps1`""
                    Exit
                }
            }

@KnifMelti
Copy link
Contributor

...or better; if it was a success, fail or of it already was the latest one installed.

@KnifMelti
Copy link
Contributor

I'm creating a propose branch with returns: success/fail/current

@FaserF
Copy link
Contributor

FaserF commented Nov 4, 2023

@FaserF any idea why MegaLinter cannot create the PR ? image

I will have a look into it

see here: #469

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants