various fixes

This commit is contained in:
David Young
2026-04-09 14:58:24 -06:00
parent 5543eb0d66
commit 70c73005ee
5 changed files with 14 additions and 14 deletions

View File

@@ -3,7 +3,7 @@ version=4.22
wget=https://github.com/tardate/ESPHamClock/archive/refs/tags/4.22.zip
install=$HOME/.local/bin/hamclock
gui=true
steps=cd src, make, make hamclock-1600x960, mv hamclock-1600X960 $HOME/.local/bin/hamclock
steps=cd src, make, make hamclock-1600x960, mv hamclock-1600x960 $HOME/.local/bin/hamclock
[openhamclock]
version=
@@ -15,4 +15,4 @@ steps=npm ci, cp .env.example .env, read -rp "What is your call sign? " CALLSIGN
version=1.8.1
git=https://github.com/wb2osz/direwolf.git
install=$HOME/.local/bin/direwolf
steps=mkdir build, cd build, cmake .. -DCMAKE_INSTALL_PREFIX=$HOME/.local, make -j4, sudo make install, sudo udevadm control --reload-rules, mkdir -p $HOME/.local/state/HamPack/conf.d, cp -n $HOME/.local/share/HamPack/conf.d/direwolf.conf $HOME/.local/state/HamPack/conf.d/
steps=mkdir build, cd build, cmake .. -DCMAKE_INSTALL_PREFIX=$HOME/.local, make -j4, sudo make install, sudo udevadm control --reload-rules, mkdir -p $HOME/.local/state/HamPack/conf.d

View File

@@ -22,4 +22,4 @@ print_logo
echo "Let's get the lastest changes to HamPack..."
wget -qO- https://gitea.young.computer/david/hampack/raw/branch/main/install.sh | bash
wget -qO- https://gitea.young.computer/david/HamPackServer/raw/branch/main/install.sh | bash

View File

@@ -162,8 +162,10 @@ fetch_source() {
if [ "$count" -eq 1 ] && [ -d "$src_dir/$contents" ]; then
echo " Descending into $contents..."
local inner="$src_dir/$contents"
shopt -s dotglob
mv "$inner"/* "$src_dir/"
rmdir "$inner"
shopt -u dotglob
rm -rf "$inner"
fi
;;
*.tar.gz|*.tgz)
@@ -308,7 +310,7 @@ if [ ! -f "$CONF_FILE" ]; then
fi
mkdir -p "$TMP_DIR"
mkdir -p "$HOME/.local/state/HamPack"
mkdir -p "$HOME/.local/state/HamPackServer"
echo "Starting HamPack source builds..."
process_conf

View File

@@ -28,10 +28,9 @@ print_logo
cd ~
sudo -v
# Keep sudo session alive for the duration of the script
( while true; do sudo -v; sleep 60; done ) &
SUDO_KEEPALIVE_PID=$!
trap "kill $SUDO_KEEPALIVE_PID" EXIT
# Extend sudo timeout for the duration of the install, clean up on exit
echo "Defaults timestamp_timeout=120" | sudo tee /etc/sudoers.d/99-hampack-install > /dev/null
trap "sudo rm -f /etc/sudoers.d/99-hampack-install" EXIT
if ! command -v git &> /dev/null; then
echo "Installing git..."
@@ -47,11 +46,11 @@ fi
echo "Getting the latest version of HamPackServer..."
rm -rf ~/.local/share/HamPackServer
git clone https://gitea.young.computer/david/HamPackServer.git $HOME/.local/share/HamPackServer > /dev/null
git clone https://gitea.young.computer/david/HamPackServer.git "$HOME/.local/share/HamPackServer" > /dev/null
mkdir -p $HOME/.local/bin
cp $HOME/.local/share/HamPackServer/hampackserverrefresh $HOME/.local/bin/hampackserverrefresh
cp $HOME/.local/share/HamPackServer/hampackserverupdate $HOME/.local/bin/hampackserverupdate
mkdir -p "$HOME/.local/bin"
cp "$HOME/.local/share/HamPackServer/hampackserverrefresh" "$HOME/.local/bin/hampackserverrefresh"
cp "$HOME/.local/share/HamPackServer/hampackserverupdate" "$HOME/.local/bin/hampackserverupdate"
cd ~/.local/share/HamPackServer

View File

@@ -7,6 +7,5 @@ SERVERS=(
UTILITIES=(
nodejs
npm
nvm
)