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

Update Hexen 2, condense libs, fix ogg playback on JelOS #94

Merged
merged 2 commits into from
Feb 18, 2024

Conversation

Slayer366
Copy link
Collaborator

Update Hexen 2 scripts, detect devices with triggers, condense libs to one directory, removed libs that interfered with ogg playback on JelOS

…o one directory, removed libs that interfered with ogg playback on JelOS
@Cebion
Copy link
Collaborator

Cebion commented Feb 15, 2024

@Slayer366 I do have a question.
You're doing this
$ESUDO rm -f $GAMEDIR/lib/libasound.so.2 $GAMEDIR/lib/libvorbis.so.0 $GAMEDIR/lib/libvorbisenc.so.2 $GAMEDIR/lib/libvorbisfile.so.3

Why are you deleting the files in the .sh instead of deleting them from the package?
That does not make sense, only for existing installations maybe.

@kloptops
Copy link
Contributor

@Slayer366 I do have a question. You're doing this $ESUDO rm -f $GAMEDIR/lib/libasound.so.2 $GAMEDIR/lib/libvorbis.so.0 $GAMEDIR/lib/libvorbisenc.so.2 $GAMEDIR/lib/libvorbisfile.so.3

Why are you deleting the files in the .sh instead of deleting them from the package? That does not make sense, only for existing installations maybe.

Looks like you answered your own question.

@Cebion
Copy link
Collaborator

Cebion commented Feb 15, 2024

@Slayer366 I do have a question. You're doing this $ESUDO rm -f $GAMEDIR/lib/libasound.so.2 $GAMEDIR/lib/libvorbis.so.0 $GAMEDIR/lib/libvorbisenc.so.2 $GAMEDIR/lib/libvorbisfile.so.3
Why are you deleting the files in the .sh instead of deleting them from the package? That does not make sense, only for existing installations maybe.

Looks like you answered your own question.

I know, but! after they were removed once, the script will try to delete these files every time.
So either put them in an -f file condition or don't put the delete line in at all.

@Cebion Cebion requested review from tabreturn and JeodC February 15, 2024 12:41
@Slayer366
Copy link
Collaborator Author

Slayer366 commented Feb 15, 2024

I've certainly removed the files from the package, but like you pointed out if someone overwrites an existing installation by re-installing they will be present on that individual's memory stick still. If the files don't exist, the rm command will simply complain that those files are not present and the script will continue anyway. The end user probably won't ever see the error message anyway. I can remove the delete line, but I guess it'll have to be stated somewhere to at least delete the old libs folder prior to reinstalling if doing so from the previous release. My goal was simply to attempt a fail-safe update for everyone (if that makes sense). Setting it to do a check if the files exist prior to deletion would be fine, but I was also trying desperately to keep the shell script short, too.

@Cebion
Copy link
Collaborator

Cebion commented Feb 15, 2024

I've certainly removed the files from the package, but like you pointed out if someone overwrites an existing installation by re-installing they will be present on that individual's memory stick still. If the files don't exist, the rm command will simply complain that those files are not present and the script will continue anyway. The end user probably won't ever see the error message anyway. I can remove the delete line, but I guess it'll have to be stated somewhere to at least delete the old libs folder prior to reinstalling if doing so from the previous release. My goal was simply to attempt a fail-safe update for everyone (if that makes sense). Setting it to do a check if the files exist prior to deletion would be fine, but I was also trying desperately to keep the shell script short, too.

[ -f "$GAMEDIR/lib/libasound.so.2" ] && rm -f $GAMEDIR/lib/libasound.so.2 $GAMEDIR/lib/libvorbis.so.0 $GAMEDIR/lib/libvorbisenc.so.2 $GAMEDIR/lib/libvorbisfile.so.3

😃

@Slayer366
Copy link
Collaborator Author

I see that it only checks for the one file, but that's good enough for me. I'll make this change rq.

@Slayer366
Copy link
Collaborator Author

@Cebion @kloptops Lemme know if all's well now

Copy link
Collaborator

@Cebion Cebion left a comment

Choose a reason for hiding this comment

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

👍

@Cebion Cebion merged commit e24212e into PortsMaster:main Feb 18, 2024
1 check passed
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