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

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: termux/termux-tools
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.40.7
Choose a base ref
...
head repository: termux/termux-tools
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.41.0
Choose a head ref
  • 6 commits
  • 8 files changed
  • 1 contributor

Commits on Mar 8, 2024

  1. mirrors: remove mirror files and entries from Makefile for mirrors re… 

    …moved in 138bb91

Previously only variables being set in mirror files were removed without removing the actual files. That resulted in following errors when `pkg` was run as required variables weren't being set.

```
/data/data/com.termux/files/usr/bin/pkg: line 106: MAIN: unbound variable
/data/data/com.termux/files/usr/bin/pkg: line 111: WEIGHT: unbound variable
```
    @agnostic-apollo
    agnostic-apollo committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    e384398 View commit details
    Browse the repository at this point in the history

  2. mirrors: set mirrors list max line length at 70 characters and use on… 

    …ly spaces instead of mix of tabs and spaces
    @agnostic-apollo
    agnostic-apollo committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    834b690 View commit details
    Browse the repository at this point in the history

  3. build: generate conffiles via Makefile instead of in termux-packages … 

    …build.sh

This changes build order where root directory will be built first before SUBDIRS.

https://www.gnu.org/software/automake/manual/html_node/Subdirectories.html
    @agnostic-apollo
    agnostic-apollo committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    c3d1b6f View commit details
    Browse the repository at this point in the history

  4. mirrors: fix removed, renamed and moved mirrors not getting deleted d… 

    …uring package updates by manually deleting them in preinst step

The `uninstall-removed-mirrors` target also deletes the removed mirrors from installation prefix, which wasn't being done before for build infrastructure and old files kept getting packed.
    @agnostic-apollo
    agnostic-apollo committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    1945fc9 View commit details
    Browse the repository at this point in the history

  5. pkg: ignore invalid mirror files that do not set the MAIN, X11, `… 

    …ROOT` and `WEIGHT` variables to valid values

We also unset the 4 variables before sourcing script to ensure the variables were set by the mirror file itself and not already exported before running `pkg` or for potentially a different sourced mirror file.

Previously, errors like following would have been generated, like before fixes done in e384398.

```
/data/data/com.termux/files/usr/bin/pkg: line 106: MAIN: unbound variable
/data/data/com.termux/files/usr/bin/pkg: line 111: WEIGHT: unbound variable
```
    @agnostic-apollo
    agnostic-apollo committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    dbe9dc3 View commit details
    Browse the repository at this point in the history

  6. version 1.41.0

    @agnostic-apollo
    agnostic-apollo committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    3e71c23 View commit details
    Browse the repository at this point in the history
Loading