mirror of
https://github.com/Start9Labs/start-os.git
synced 2026-03-26 02:11:53 +00:00
Feature/start tunnel (#3037)
* fix live-build resolv.conf * improved debuggability * wip: start-tunnel * fixes for trixie and tor * non-free-firmware on trixie * wip * web server WIP * wip: tls refactor * FE patchdb, mocks, and most endpoints * fix editing records and patch mocks * refactor complete * finish api * build and formatter update * minor change toi viewing addresses and fix build * fixes * more providers * endpoint for getting config * fix tests * api fixes * wip: separate port forward controller into parts * simplify iptables rules * bump sdk * misc fixes * predict next subnet and ip, use wan ips, and form validation * refactor: break big components apart and address todos (#3043) * refactor: break big components apart and address todos * starttunnel readme, fix pf mocks, fix adding tor domain in startos --------- Co-authored-by: Matt Hill <mattnine@protonmail.com> * better tui * tui tweaks * fix: address comments * better regex for subnet * fixes * better validation * handle rpc errors * build fixes * fix: address comments (#3044) * fix: address comments * fix unread notification mocks * fix row click for notification --------- Co-authored-by: Matt Hill <mattnine@protonmail.com> * fix raspi build * fix build * fix build * fix build * fix build * try to fix build * fix tests * fix tests * fix rsync tests * delete useless effectful test --------- Co-authored-by: Matt Hill <mattnine@protonmail.com> Co-authored-by: Alex Inkin <alexander@inkin.ru>
This commit is contained in:
@@ -4,8 +4,9 @@ set -e
|
||||
|
||||
cd "$(dirname "${BASH_SOURCE[0]}")"
|
||||
|
||||
BASENAME=$(./basename.sh)
|
||||
VERSION=$(cat ./VERSION.txt)
|
||||
PROJECT=${PROJECT:-"startos"}
|
||||
BASENAME=${BASENAME:-"$(./basename.sh)"}
|
||||
VERSION=${VERSION:-$(cat ./VERSION.txt)}
|
||||
if [ "$PLATFORM" = "x86_64" ] || [ "$PLATFORM" = "x86_64-nonfree" ]; then
|
||||
DEB_ARCH=amd64
|
||||
elif [ "$PLATFORM" = "aarch64" ] || [ "$PLATFORM" = "aarch64-nonfree" ] || [ "$PLATFORM" = "raspberrypi" ]; then
|
||||
@@ -17,14 +18,34 @@ fi
|
||||
rm -rf dpkg-workdir/$BASENAME
|
||||
mkdir -p dpkg-workdir/$BASENAME
|
||||
|
||||
make install DESTDIR=dpkg-workdir/$BASENAME
|
||||
if [ "${PROJECT}" = "startos" ]; then
|
||||
INSTALL_TARGET="install"
|
||||
else
|
||||
INSTALL_TARGET="install-${PROJECT#start-}"
|
||||
fi
|
||||
make "${INSTALL_TARGET}" DESTDIR=dpkg-workdir/$BASENAME
|
||||
|
||||
DEPENDS=$(cat dpkg-workdir/$BASENAME/usr/lib/startos/depends | tr $'\n' ',' | sed 's/,,\+/,/g' | sed 's/,$//')
|
||||
CONFLICTS=$(cat dpkg-workdir/$BASENAME/usr/lib/startos/conflicts | tr $'\n' ',' | sed 's/,,\+/,/g' | sed 's/,$//')
|
||||
if [ -f dpkg-workdir/$BASENAME/usr/lib/$PROJECT/depends ]; then
|
||||
if [ -n "$DEPENDS" ]; then
|
||||
DEPENDS="$DEPENDS,"
|
||||
fi
|
||||
DEPENDS="${DEPENDS}$(cat dpkg-workdir/$BASENAME/usr/lib/$PROJECT/depends | tr $'\n' ',' | sed 's/,,\+/,/g' | sed 's/,$//')"
|
||||
fi
|
||||
if [ -f dpkg-workdir/$BASENAME/usr/lib/$PROJECT/conflicts ]; then
|
||||
if [ -n "$CONFLICTS" ]; then
|
||||
CONFLICTS="$CONFLICTS,"
|
||||
fi
|
||||
CONFLICTS="${CONFLICTS}$(cat dpkg-workdir/$BASENAME/usr/lib/$PROJECT/conflicts | tr $'\n' ',' | sed 's/,,\+/,/g' | sed 's/,$//')"
|
||||
fi
|
||||
CONFLICTS=${CONFLICTS:-"$(cat dpkg-workdir/$BASENAME/usr/lib/startos/conflicts | tr $'\n' ',' | sed 's/,,\+/,/g' | sed 's/,$//')"}
|
||||
|
||||
cp -r debian dpkg-workdir/$BASENAME/DEBIAN
|
||||
if [ -d debian/${PROJECT} ]; then
|
||||
cp -r debian/${PROJECT} dpkg-workdir/$BASENAME/DEBIAN
|
||||
else
|
||||
mkdir -p dpkg-workdir/$BASENAME/DEBIAN
|
||||
fi
|
||||
cat > dpkg-workdir/$BASENAME/DEBIAN/control << EOF
|
||||
Package: startos
|
||||
Package: ${PROJECT}
|
||||
Version: ${VERSION}
|
||||
Section: unknown
|
||||
Priority: required
|
||||
|
||||
Reference in New Issue
Block a user