ES devs and testers, this tool is for you!

meleu

@Hex said in Help testing: Random Video Screensaver on Main Branch:

To combine all of theme in one sentence you can have the command as such :
git pull || git merge --abort && git pull -X theirs

The || ensures that git merge --abort && git pull -X theirs only runs if git pull fails

Oops. It didn't work as expected. Look what I mean:

$ echo bla || echo ble && echo bli
bla
bli

Got it?

But there's no problem, I adjusted it here:

if ! git pull; then
    git merge --abort && git pull -X theirs
fi

I'm making the git tweaks now (and creating my own version of gitPullOrClone), but you can still name your version as epsilon. :-)

edit: git tweaks done.

edit 2: I borrowed rpSwap code from RetroPie-Setup's helpers.sh, and now helpers.sh is not a dependency anymore.

lilbud

@meleu Damnit, I thought you were making a Power Rangers: S.P.D, Space Patrol Delta.

Hex

@meleu said in ES devs and testers, this tool is for you!:

@Hex said in Help testing: Random Video Screensaver on Main Branch:

To combine all of theme in one sentence you can have the command as such :
git pull || git merge --abort && git pull -X theirs

The || ensures that git merge --abort && git pull -X theirs only runs if git pull fails

Oops. It didn't work as expected. Look what I mean:
$ echo bla || echo ble && echo bli
bla
bli
Got it?

But there's no problem, I adjusted it here:
if ! git pull; then
    git merge --abort && git pull -X theirs
fi
I'm making the git tweaks now (and creating my own version of gitPullOrClone), but you can still name your version as epsilon. :-)

edit: git tweaks done.

edit 2: I borrowed rpSwap code from RetroPie-Setup's helpers.sh, and now helpers.sh is not a dependency anymore.

it should be echo haha || ( echo hehe && echo hoho )

I forgot those brackets.

TMNTturtlguy

@Hex ha ha he he ho ho, can we add fe fi fo fum? :)

lilbud

@TMNTturtlguy

Hex

Added features :

Install on Linux (PC)
Optimized handling ES installation.

@meleu I would like to stick to Zeta version. My changes are taking more time than expected. I would like to include all changes you incorporate for Epsilon. If and only if Epsilon is not released by then, I shall drop down to Epsilon as version. Should I post it on my repository?

How do I go about submitting PRs. You have many scripts in single repo.

meleu

@Hex said in ES devs and testers, this tool is for you!:

Added features :

Install on Linux (PC)

??
I've been always using it on my Linux x86...

@meleu I would like to stick to Zeta version.

The current version is delta3(lower case), I go ahead for the next Greek letter when a new functionality is added. When adding tweaks and/or small fixes I just add a trailing sequential number.

How do I go about submitting PRs. You have many scripts in single repo.

Well, that repo should be a place for "small codes to share with friends or to make me remember some trick" as the description says. But as this script is getting a bit more serious, I've created another repo:

https://github.com/meleu/rp-testers

You can submit your PR there.

Thanks!

Hex

@meleu I have put my script here : https://github.com/hex007/es-dev/blob/master/es-tests.sh

Feel free to merge changes. I am currently busy and unable to work on this. If I make any changes I shall commit there and let you know else fork your repo once you have merged changes so there is a single copy.

EDIT : Also I have to mention that the correct word is to "skip" and not "omit" the make clean.

meleu

@Hex Phew... What a relief! I thought you were hating me because I don't indent my code with tabs!

Thanks for the English. tip ;-)

Zigurana

@meleu
https://stackoverflow.blog/2017/06/15/developers-use-spaces-make-money-use-tabs/

meleu

@Zigurana haha!
I will certainly use those data in future tabs x spaces flame wars!

cyperghost

Hey I am not using spaces or tabs!

Wait there is someone on my door ringing....
Ah the new helicopter is delivered.... I do not like used ones.

Hex

@meleu said in ES devs and testers, this tool is for you!:

@Hex Phew... What a relief! I thought you were hating me because I don't indent my code with tabs!

Thanks for the English. tip ;-)

I had mentioned in one of the threads that I would be busy this week. I uploaded the code long ago. Just forgot to update it here. I apologise for that.

I am quite flexible with tabs or spaces.

Hex

@meleu I had an idea while working with this. You know how users using this script are testers only and dont contribute (git push) code (no offence to those who do). I was thinking if it would be ok to have a patch screen where users could add patches with features to their current build.

eg. I have published a simple commit that increases the font size for smaller screens. If a tester is interested they can use this patch to whichever ES they are compiling unless there is a conflict. This allows tested patches to be used by the testers customizing their builds.

Hex

@meleu Patch support added and a complete rewrite of the script. you can find it here. The format for patches is

repo_url branch commit_hash message

eg : My patch for small sceens to increase fonts and general sizes
repo_url -> https://github.com/hex007/EmulationStation
branch -> small-screen-upstream
commit_hash -> 557ab36b8e860a12bc9e6da1d2abdb0a148eae33
message -> Mod for smaller screens

so a single line looks like

https://github.com/hex007/EmulationStation small-screen-upstream 557ab36b8e860a12bc9e6da1d2abdb0a148eae33 Mod for smaller screens

https://github.com/hex007/es-dev/blob/master/es-dev.sh

It is quite astonishing that we have reached so far in such a short time.

meleu

Tabs vs Spaces again...

I was looking for all valid xml entries for a gamelist.xml. The more "natural" doc would be the GAMELISTS.md, but it lacks info about <video>, <marquee>, etc. Fortunately this doc says: "(if you suspect this section is out of date, check out src/MetaData.cpp)"

And here is how the info I need looks like thanks to the use of tabs:

lilbud

~~Ummmm...Dumb Question, how do I run the file? I keep getting permission denied errors.~~

Never mind

meleu

@lilbud Ooops! I didn't make it clear on the OP. Gonna update it. Thanks.

meleu

New version released: epsilon

Update the script using the Update feature at the Main Menu.

Changelog

Added an option to load the repo/branch list from the open Pull Requests in RetroPie's EmulationStation repository (thanks @Hex for the insight!).

Added the description field (optional). The description is displayed on the bottom of the screen.

small cleanups and fixes.

lilbud

@meleu What software do you use to ssh into the pi?