Fix cherrypick URL parsing with colon

.gitignore

@@ -1,6 +1,8 @@
-sources/
+src/
 bin/
-files/
+.vscode/
-patches/
+*.code-workspace
-.lock
+backups/
-make.log
+.dependencies_source
+.dependencies_ib
+

.vscode/launch.json

@@ -1,19 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "type": "bashdb",
-            "request": "launch",
-            "terminalKind": "integrated",
-            "name": "Bash-Debug (simplest configuration)",
-            "program": "${file}",
-            "args": [
-                "-d", 
-                "-p", "r4s"
-            ]
-        }
-    ]
-}

.vscode/settings.json

@@ -1,10 +0,0 @@
-{
-    "window.title": "openwrtbuilder",
-    "cSpell.words": [
-        "infile",
-        "isfile",
-        "openwrt",
-        "regen",
-        "sysbackup"
-    ]
-}

.vscode/tasks.json

@@ -1,13 +0,0 @@
-{
-    // See https://go.microsoft.com/fwlink/?LinkId=733558
-    // for the documentation about the tasks.json format
-    "version": "2.0.0",
-    "tasks": [
-        {
-            "label": "Build RPi4 snapshot in toolbox",
-            "type": "shell",
-            "command": "toolbox run ${file} -p r4s -d",
-            "problemMatcher": []
-        }
-    ]
-}

README.md

@@ -1,3 +1,56 @@
 # openwrtbuilder
 
-See `openwrtbuilder --help` for help options.
+Build and deploy OpenWRT images using shell-style device profiles, via source code or the official Image Builder.
+
+## Usage
+
+`openwrtbuilder [OPTION [VALUE]]... -p PROFILE [-p PROFILE]...`
+
+## Options
+
+```(text)
+--profile,-p PROFILE
+--release,-r,--version,-v RELEASE ("snapshot", "22.03.3")
+--buildroot,-b PATH (Default: script directory)
+--source
+  Build image from source code, not from Image Builder.
+  Allows make config options to be passed in profile.
+  Uses git worktree for multi-profile deduplication.
+--ssh-upgrade HOST
+  Example: root@192.168.1.1
+--ssh-backup SSH_PATH
+  Enabled by default for --ssh-upgrade
+--flash,-f DEVICE
+  Example: /dev/sdX
+--reset
+  Cleanup all source and output files
+  Can be combined with -p to reset a specific profile
+--depends
+  Force dependency installation
+--yes,-y
+  Assume yes for all questions (automatic mode)
+--debug,-d
+--help,-h
+```
+
+## Profiles
+
+See `profiles` for example device profile definitions. Multiple `--profile` can be passed at once.
+
+The default build mode is  `imagebuilder` unless `--source` is passed. Default profile modes can be set individually in `profiles`.
+
+## Examples
+
+* `openwrtbuilder -p r4s -p ax6000`
+* `openwrtbuilder -p r4s -r snapshot --debug`
+* `openwrtbuilder -p ax6000 -r 23.05.5 --source --debug`
+* `openwrtbuilder -p rpi4 -r 23.05.5 --flash /dev/sdX`
+* `openwrtbuilder -p linksys -r snapshot --ssh-upgrade root@192.168.1.1`
+
+## Additional Info
+
+Find `openwrtbuilder` useful? [Paypal me a coffee!](https://paypal.me/bryanroessler)
+
+[↓ ↓ ↓ Bitcoin ↓ ↓ ↓](bitcoin:bc1q7wy0kszjavgcrvkxdg7mf3s6rh506rasnhfa4a)
+
+[![Bitcoin](https://repos.bryanroessler.com/files/bc1q7wy0kszjavgcrvkxdg7mf3s6rh506rasnhfa4a.png)](bitcoin:bc1q7wy0kszjavgcrvkxdg7mf3s6rh506rasnhfa4a)

openwrtbuilder.code-workspace

@@ -1,17 +0,0 @@
-{
-	"folders": [
-		{
-			"path": "."
-		}
-	],
-	"settings": {
-		"window.title": "openwrtbuilder",
-		"cSpell.words": [
-			"openwrtbuilder",
-			"padx"
-		],
-		"cSpell.ignoreWords": [
-			"openwrtbuilder"
-		]
-	}
-}

profiles

@@ -1,166 +1,159 @@
 #!/usr/bin/env bash
+# Device profiles for openwrtbuilder
 # shellcheck disable=SC2034
-# This file contains a set of device profiles for openwrtbuilder
 
-# Packages to install for all profiles
+# Default (but optional) packages (precede with "-" to exclude)
-default_packages="\
+default_packages=(nano htop diffutils tar iperf3 zsh rsync curl tcpdump
-	luci \
+  openssh-sftp-server luci luci-ssl luci-proto-wireguard luci-app-statistics
-	luci-ssl \
+  collectd-mod-sensors collectd-mod-thermal collectd-mod-conntrack collectd-mod-cpu
-	nano \
+)
-	htop \
-	tcpdump \
-	diffutils \
-	tar \
-	iperf \
-	bash \
-	rsync " # Leave trailing whitespace
 
+# Default (but optional) kernel configs
+default_configs=(
+)
 
-declare -Ag archer
+# Current devices
-archer['profile']="tplink_archer-c7-v2"
+declare -Ag r4s=(
-archer['target']="ath79/generic"
+  [mode]="source"
-archer['filesystem']="squashfs"
+  [device]="friendlyarm_nanopi-r4s"
-archer['packages']="\
+  [target]="rockchip/armv8"
-	$default_packages \
+  [filesystem]="ext4"
-	-dnsmasq \
+  [packages]="${default_packages[*]} \
-	-odhcpd \
+    luci-app-ddns luci-app-sqm \
-	-iptables \
+    adblock luci-app-adblock \
-	-ath10k-firmware-qca988x-ct \
+    collectd-mod-df usbutils kmod-usb-storage kmod-usb-storage-uas \
-	ath10k-firmware-qca988x-ct-full-htt"
+    kmod-fs-btrfs btrfs-progs block-mount smcroute avahi-daemon \
+    ethtool ca-bundle tailscale"
+  [config]="${default_configs[*]} \
+    CONFIG_KERNEL_BTRFS_FS_POSIX_ACL=y CONFIG_BTRFS_PROGS_ZSTD=y \
+    CONFIG_TARGET_ROOTFS_PARTSIZE=512 CONFIG_TARGET_KERNEL_PARTSIZE=32"
+  [files]="/mnt/backup"
+  # For 24.10 branch (Linux 6.6)
+  # [cherrypicks]="https://github.com/wurzerj/openwrt.git:59d6e31 \
+  # https://github.com/wurzerj/openwrt.git:bb251b8" # fix inconsistent reboot
+)
 
-declare -Ag linksys
+declare -Ag ax6000=(
-linksys['profile']="linksys_ea8300"
+  [mode]="imagebuilder"
-linksys['target']="ipq40xx/generic"
+  [device]="xiaomi_redmi-router-ax6000-stock"
-linksys['filesystem']="squashfs"
+  [target]="mediatek/filogic"
-linksys['packages']="\
+  [release]="snapshot"
-	$default_packages \
+  [filesystem]="squashfs"
-	-dnsmasq \
+  [packages]="${default_packages[*]} \
-	-odhcpd \
+    -dnsmasq -odhcpd-ipv6only -nftables -firewall4 tailscale"
-	-iptables"
+)
 
-declare -Ag rpi4
+declare -Ag ax6000_uboot=(
-rpi4['profile']="rpi-4"
+  [mode]="imagebuilder"
-rpi4['target']="bcm27xx/bcm2711"
+  [device]="xiaomi_redmi-router-ax6000-ubootmod"
-rpi4['filesystem']="ext4"
+  [target]="mediatek/filogic"
-rpi4['packages']="\
+  [release]="snapshot"
-	$default_packages \
+  [filesystem]="squashfs"
-	kmod-usb-net-asix-ax88179 \
+  [packages]="${default_packages[*]} \
-	kmod-usb-net-rtl8152 \
+    -dnsmasq -odhcpd-ipv6only -nftables -firewall4"
-	luci-app-upnp \
+)
-	luci-app-wireguard \
-	luci-app-vpn-policy-routing \
-	-dnsmasq \
-	dnsmasq-full \
-	luci-app-ddns \
-	luci-app-sqm"
 
-declare -Ag r2s
+declare -Ag n5100=(
-r2s['profile']="friendlyarm_nanopi-r2s"
+  [device]="generic"
-r2s['target']="rockchip/armv8"
+  [target]="x86/64"
-r2s['filesystem']="ext4"
+  [filesystem]="squashfs"
-r2s['packages']="\
+  [packages]="${default_packages[*]} \
-	$default_packages \
+    luci-app-ddns irqbalance collectd-mod-df \
-	luci-app-upnp \
+    usbutils kmod-usb-storage kmod-usb-storage-uas kmod-fs-btrfs \
-	luci-app-wireguard \
+    btrfs-progs block-mount cryptsetup kmod-crypto-xts smcroute \
-	luci-app-vpn-policy-routing \
+    avahi-daemon ethtool ca-bundle smartmontools intel-microcode \
-	-dnsmasq \
+    lm-sensors samba4-server luci-app-samba4 tailscale shadow-useradd"
-	dnsmasq-full \
+  [config]="${default_configs[*]} \
-	luci-app-ddns \
+    CONFIG_KERNEL_BTRFS_FS_POSIX_ACL=y CONFIG_BTRFS_PROGS_ZSTD=y \
-	luci-app-sqm \
+    CONFIG_TARGET_ROOTFS_PARTSIZE=512 CONFIG_TARGET_KERNEL_PARTSIZE=32"
-	luci-app-statistics \
+  # [files]="/mnt/backup"
-	collectd-mod-sensors \
+)
-	collectd-mod-thermal \
-	collectd-mod-conntrack \
-	smcroute \
-	curl \
-	ethtool"
 
-declare -Ag r4s
+declare -Ag w1700k=(
-r4s['release']="snapshot"
+  [mode]="source"
-r4s['profile']="friendlyarm_nanopi-r4s"
+  [device]="gemtek_w1700k"
-r4s['target']="rockchip/armv8"
+  [target]="airoha/an7581"
-r4s['filesystem']="ext4"
+  [filesystem]="squashfs"
-r4s['repo']="src/gz stangri_repo https://repo.openwrt.melmac.net"
+  [release]="snapshot"
-# fw3 + vpn-policy-routing
+  [packages]="${default_packages[*]} \
-# r4s['packages']="\
+    luci-app-ddns luci-app-sqm \
-# 	$default_packages \
+    adblock luci-app-adblock \
-# 	luci-app-upnp \
+    smcroute avahi-daemon \
-# 	luci-app-wireguard \
+    lm-sensors samba4-server luci-app-samba4 tailscale shadow-useradd \
-# 	luci-app-vpn-policy-routing \
+    ethtool ca-bundle tailscale"
-#   vpn-policy-routing \
+  [cherrypicks]="\
-# 	-dnsmasq \
+    https://github.com/OpenWRT-fanboy/OpenW1700k.git@lumos:8d449e968cfaa774ab7a219b3a5ab4251b2f9352 \
-# 	dnsmasq-full \
+    https://github.com/OpenWRT-fanboy/OpenW1700k.git@lumos:3033241393ef6eb562539c6a3ccb9d3cf1a25d05 \
-# 	luci-app-ddns \
+    https://github.com/OpenWRT-fanboy/OpenW1700k.git@lumos:79a21e0986a9efe6de3a07394a71ac15a2107b16 \
-# 	luci-app-sqm \
+    https://github.com/OpenWRT-fanboy/OpenW1700k.git@lumos:2f8a1cbf901df0d325dfe112fdfe8013a72c8305 \
-# 	luci-app-statistics \
+    https://github.com/OpenWRT-fanboy/OpenW1700k.git@lumos:71b09bc5852797cdbf7cb3b56a7d8fcd9d4ca9db \
-# 	collectd-mod-sensors \
+    https://github.com/OpenWRT-fanboy/OpenW1700k.git@lumos:fe0135f0b7037a9cc1985d5937dd24cb99bfccb1 \
-# 	collectd-mod-thermal \
+    https://github.com/OpenWRT-fanboy/OpenW1700k.git@lumos:cdb937180fb971fe702078f0e0fef63f2fcce337 \
-# 	collectd-mod-conntrack \
+    https://github.com/OpenWRT-fanboy/OpenW1700k.git@lumos:6dc847c802b9dc597fc2c64711ca85499f128d1d \
-# 	smcroute \
+    https://github.com/OpenWRT-fanboy/OpenW1700k.git@lumos:b6e6cf911915dd987eecde908a2013419565cff4 \
-# 	curl \
+    https://github.com/OpenWRT-fanboy/OpenW1700k.git@lumos:708089948949e66f5234249fc631e0453b58942e \
-# 	ethtool \
+    https://github.com/OpenWRT-fanboy/OpenW1700k.git@lumos:9841a707a577385498591bcfb56b836176325c2f \
-# 	kmod-ipt-nat6 \
+    https://github.com/OpenWRT-fanboy/OpenW1700k.git@lumos:8446ec6431a3247683a27070d3c69f2789b52c70 \
-# 	-firewall4 \
+    https://github.com/OpenWRT-fanboy/OpenW1700k.git@lumos:05380e2ef5fb96c171da23453ba32aa349a4b126"
-# 	-nftables \
+)
-# 	-kmod-nft-offload \
-# 	firewall \
-# 	ip6tables \
-# 	iptables \
-# 	kmod-ipt-offload"
 
-# fw3 + pbr
+declare -Ag rpi4=(
-r4s['packages']="\
+  [device]="rpi-4"
-	$default_packages \
+  [target]="bcm27xx/bcm2711"
-	luci-app-upnp \
+  [filesystem]="ext4"
-	luci-app-wireguard \
+  [packages]="${default_packages[*]} \
-	luci-app-pbr \
+    luci-app-upnp luci-app-pbr -dnsmasq dnsmasq-full luci-app-ddns luci-app-sqm \
-	pbr-ipt \
+    kmod-usb-net-asix-ax88179 kmod-usb-net-rtl8152"
-	-dnsmasq \
+)
-	dnsmasq-full \
-	luci-app-ddns \
-	luci-app-sqm \
-	luci-app-statistics \
-	collectd-mod-sensors \
-	collectd-mod-thermal \
-	collectd-mod-conntrack \
-	smcroute \
-	curl \
-	ethtool \
-	kmod-ipt-nat6 \
-	-firewall4 \
-	-nftables \
-	-kmod-nft-offload \
-	firewall \
-	ip6tables \
-	iptables \
-	kmod-ipt-offload"
 
-# fw4 + pbr
+declare -Ag r4s_stock=(
-# r4s['packages']="\
+  [device]="friendlyarm_nanopi-r4s"
-# 	$default_packages \
+  [target]="rockchip/armv8"
-# 	luci-app-upnp \
+  [filesystem]="ext4"
-# 	luci-app-wireguard \
+  [release]="snapshot"
-# 	luci-app-pbr \
+)
-# 	pbr-netifd \
-# 	-dnsmasq \
-# 	dnsmasq-full \
-# 	luci-app-ddns \
-# 	luci-app-sqm \
-# 	luci-app-statistics \
-# 	collectd-mod-sensors \
-# 	collectd-mod-thermal \
-# 	collectd-mod-conntrack \
-# 	smcroute \
-# 	curl \
-# 	ethtool \
-# 	kmod-nft-nat6"
 
-declare -Ag x5000r
+declare -Ag totolink=(
-x5000r['profile']="totolink_x5000r"
+  [device]="totolink_x5000r"
-x5000r['target']="ramips/mt7621"
+  [target]="ramips/mt7621"
-x5000r['filesystem']="squashfs"
+  [filesystem]="squashfs"
-x5000r['packages']="\
+  [packages]="${default_packages[*]} \
-	$default_packages \
+    -dnsmasq -odhcpd-ipv6only -nftables -firewall4 \
-	-dnsmasq \
+    -kmod-nft-offload collectd-mod-iwinfo"
-	-odhcpd \
+)
-	-iptables"
+
+declare -Ag archer=(
+  [device]="tplink_archer-c7-v2"
+  [target]="ath79/generic"
+  [filesystem]="squashfs"
+  [packages]="${default_packages[*]} -dnsmasq -odhcpd -iptables \
+    -ath10k-firmware-qca988x-ct ath10k-firmware-qca988x-ct-full-htt"
+)
+
+declare -Ag linksys=(
+  [device]="linksys_ea8300"
+  [target]="ipq40xx/generic"
+  [filesystem]="squashfs"
+  [packages]="${default_packages[*]} \
+    -dnsmasq -odhcpd -iptables"
+)
+
+declare -Ag r2s=(
+  [device]="friendlyarm_nanopi-r2s"
+  [target]="rockchip/armv8"
+  [filesystem]="ext4"
+  [packages]="${default_packages[*]} \
+    luci-app-upnp luci-app-pbr -dnsmasq dnsmasq-full \
+    luci-app-ddns luci-app-sqm luci-app-statistics collectd-mod-sensors \
+    collectd-mod-thermal collectd-mod-conntrack smcroute curl ethtool"
+)
+
+declare -Ag r2s_tr=(
+  [device]="friendlyarm_nanopi-r2s"
+  [target]="rockchip/armv8"
+  [filesystem]="ext4"
+  [packages]="${default_packages[*]} \
+    luci-app-upnp luci-app-pbr luci-app-ddns \
+    luci-app-statistics collectd-mod-sensors collectd-mod-thermal \
+    collectd-mod-conntrack curl ethtool travelmate"
+)