这是indexloc提供的服务,不要输入任何密码
Skip to content

Conversation

@t184256
Copy link
Contributor

@t184256 t184256 commented Jun 1, 2024

I believe that this variable isn't used consistently across scripts/.

"Draft" because I'd like to test it more thoroughly.

@t184256 t184256 force-pushed the respect-termux-app-package branch from f839771 to 6d72b44 Compare June 1, 2024 16:10
@agnostic-apollo
Copy link
Member

I already noticed this locally, but termux-tools needs to use env variables that will be exported in Termux app v0.119.0, and build time placeholders only need to be used as fallback. Also TERMUX_ root scope may be different so scripts being added need to be used instead. Same for other placeholders. But this can be merged for now for initial fix.

@agnostic-apollo
Copy link
Member

Also TERMUX_APP_PACKAGE is for the app package name, but forks may be using a different class package name than com.termux.app, so separate variable needs to be added in properties.sh and env for it.

@t184256 t184256 force-pushed the respect-termux-app-package branch from 6d72b44 to acf2a20 Compare June 1, 2024 18:48
@t184256
Copy link
Contributor Author

t184256 commented Jun 1, 2024

I'm not sure I understood it right; like this?

@t184256
Copy link
Contributor Author

t184256 commented Jun 1, 2024

(turns out I do have a fork suffixing app package name, but not the class names)

@agnostic-apollo
Copy link
Member

No no, just use @TERMUX_APP_PACKAGE@.app for now. Class package name support needs to be added in termux-packages repo, I'll do it later.

@t184256 t184256 force-pushed the respect-termux-app-package branch from acf2a20 to 6d72b44 Compare June 1, 2024 20:41
@t184256 t184256 changed the title Draft: scripts: replace com.termux with @TERMUX_APP_PACKAGE@ scripts: replace com.termux with @TERMUX_APP_PACKAGE@ Jun 1, 2024
@t184256
Copy link
Contributor Author

t184256 commented Jun 1, 2024

OK, reverted.

t184256 and others added 2 commits August 13, 2024 07:12
…AGE@`

TODO when termux/termux-packages#18872 gets merged:
- Replace `@TERMUX_APP_PACKAGE@/@TERMUX_APP_PACKAGE@.app.*` with respective component name variables.
- Replace `com.termux.termuxam.Am` with `TERMUX_AM__AM_CLASS__CLASS_NAME`.
@agnostic-apollo agnostic-apollo force-pushed the respect-termux-app-package branch from 6d72b44 to 20e2d17 Compare August 13, 2024 02:13
@agnostic-apollo agnostic-apollo merged commit 5db4ffc into termux:master Aug 13, 2024
@agnostic-apollo
Copy link
Member

agnostic-apollo commented Aug 13, 2024

Thanks for the pull.

Had to fix termux-reset for changes made previously:

Additional fixes will be done later, read the commit message e50eb26

Whoever updates the termux-tools package, should either ping me or check the paths themselves in the built deb as I haven't tested.

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.

2 participants