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

feat: move PPA sourced packaged to new 04-main repo #9

Open
wants to merge 34 commits into
base: split_github_repos
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
ecda459
Split 01-repo github-sourced apps into chunks
philclifford Feb 9, 2024
992ce95
Initialise 02- and 03-main repos
philclifford Feb 9, 2024
f4e0514
Deprecate wraith-master
philclifford May 8, 2024
3e4ca66
Reflect change of battery-monitor source from github to ppa
philclifford May 8, 2024
b2b188e
chore: cogged 01-main/README.md to reflect changes and contributions
philclifford May 7, 2024
2a1c265
Split 01-repo github-sourced apps into chunks
philclifford Feb 9, 2024
fd6d50a
chore: reset MAIN_REPO_URL for merge
philclifford May 14, 2024
66b6c32
chore: remove deprecated package specs
philclifford Sep 2, 2024
c903dcd
fix: split repos lost headings replaced
philclifford Sep 2, 2024
d1f10f9
feat: move PPA sourced packaged to new 04-main repo
philclifford May 14, 2024
c18fac5
Split 01-repo github-sourced apps into chunks
philclifford Feb 9, 2024
a6ab998
Initialise 02- and 03-main repos
philclifford Feb 9, 2024
62df63e
Deprecate wraith-master
philclifford May 8, 2024
51f7ee1
Reflect change of battery-monitor source from github to ppa
philclifford May 8, 2024
1fdf44e
chore: cogged 01-main/README.md to reflect changes and contributions
philclifford May 7, 2024
4254317
Split 01-repo github-sourced apps into chunks
philclifford Feb 9, 2024
91efbf0
chore: reset MAIN_REPO_URL for merge
philclifford May 14, 2024
2841259
chore: remove deprecated package specs
philclifford Sep 2, 2024
8de5f97
fix: split repos lost headings replaced
philclifford Sep 2, 2024
f19edf5
chore: rebased from upstream and corrected manifests
philclifford Oct 2, 2024
d465729
Merge branch 'split_github_repos' into split_ppas
philclifford Oct 2, 2024
99b82aa
Split 01-repo github-sourced apps into chunks
philclifford Feb 9, 2024
eaae930
Initialise 02- and 03-main repos
philclifford Feb 9, 2024
61fc9c7
Deprecate wraith-master
philclifford May 8, 2024
605f9d1
Reflect change of battery-monitor source from github to ppa
philclifford May 8, 2024
938bd7b
chore: cogged 01-main/README.md to reflect changes and contributions
philclifford May 7, 2024
6318a27
Split 01-repo github-sourced apps into chunks
philclifford Feb 9, 2024
ec1786b
chore: reset MAIN_REPO_URL for merge
philclifford May 14, 2024
e58a3d1
chore: remove deprecated package specs
philclifford Sep 2, 2024
5c0ee0c
fix: split repos lost headings replaced
philclifford Sep 2, 2024
f534a86
chore: rebased from upstream and corrected manifests
philclifford Oct 2, 2024
f8cd497
chore: regenerated and then fixed 01-main README
philclifford Oct 2, 2024
f80fc38
Merge branch 'split_github_repos' into split_ppas
philclifford Oct 29, 2024
e06fafb
Merge branch 'split_github_repos' into split_ppas
philclifford Oct 29, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore: reset MAIN_REPO_URL for merge
also refactor init_repos() slightly
  • Loading branch information
philclifford committed Oct 2, 2024
commit 91efbf0efee5b121fd4640d119df1efd47ce84a8
17 changes: 7 additions & 10 deletions deb-get
Original file line number Diff line number Diff line change
@@ -654,13 +654,12 @@ function init_repos() {
if [ ! -e "${ETC_DIR}/01-main.repo" ]; then
${ELEVATE} tee "${ETC_DIR}/01-main.repo" <<<"${MAIN_REPO_URL}" >/dev/null
fi
if [ ! -e "${ETC_DIR}/02-main.repo" ]; then
${ELEVATE} sed 's/01/02/' "${ETC_DIR}/01-main.repo" > "${ETC_DIR}/02-main.repo"
fi
if [ ! -e "${ETC_DIR}/03-main.repo" ]; then
${ELEVATE} sed 's/01/03/' "${ETC_DIR}/01-main.repo" > "${ETC_DIR}/03-main.repo"
fi

for subrepo in 02 03; do
if [ ! -e "${ETC_DIR}/${subrepo}-main.repo" ]; then
${ELEVATE} head -1 "${ETC_DIR}/01-main.repo" | sed "s/01/${subrepo}/" > "${ETC_DIR}/${subrepo}-main.repo"
fi
done

for REPO in $(find "${ETC_DIR}" -maxdepth 1 -name "*.repo" ! -name 00-builtin.repo ! -name 99-local.repo -type f -printf "%f\n" | sed "s/.repo$//"); do
if [ ! -e "${ETC_DIR}/${REPO}.d" ]; then
${ELEVATE} mkdir "${ETC_DIR}/${REPO}.d" 2>/dev/null
@@ -1582,11 +1581,9 @@ fi

export CACHE_DIR="/var/cache/deb-get"
readonly ETC_DIR="/etc/deb-get"
readonly MAIN_REPO_URL="https://raw.githubusercontent.com/philclifford/deb-get/split_github_repos/01-main"

readonly MAIN_REPO_URL="https://raw.githubusercontent.com/wimpysworld/deb-get/main/01-main"
readonly USER_AGENT="Mozilla/5.0 (X11; Linux ${HOST_CPU}) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.127 Safari/537.36"
readonly USER_HOME="${HOME}"

readonly DEBGET_BIN=$(basename $0)

parse_machine