various fixes
This commit is contained in:
@@ -3,7 +3,7 @@ version=4.22
|
|||||||
wget=https://github.com/tardate/ESPHamClock/archive/refs/tags/4.22.zip
|
wget=https://github.com/tardate/ESPHamClock/archive/refs/tags/4.22.zip
|
||||||
install=$HOME/.local/bin/hamclock
|
install=$HOME/.local/bin/hamclock
|
||||||
gui=true
|
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]
|
[openhamclock]
|
||||||
version=
|
version=
|
||||||
@@ -15,4 +15,4 @@ steps=npm ci, cp .env.example .env, read -rp "What is your call sign? " CALLSIGN
|
|||||||
version=1.8.1
|
version=1.8.1
|
||||||
git=https://github.com/wb2osz/direwolf.git
|
git=https://github.com/wb2osz/direwolf.git
|
||||||
install=$HOME/.local/bin/direwolf
|
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
|
||||||
|
|||||||
@@ -22,4 +22,4 @@ print_logo
|
|||||||
|
|
||||||
echo "Let's get the lastest changes to HamPack..."
|
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
|
||||||
|
|||||||
@@ -162,8 +162,10 @@ fetch_source() {
|
|||||||
if [ "$count" -eq 1 ] && [ -d "$src_dir/$contents" ]; then
|
if [ "$count" -eq 1 ] && [ -d "$src_dir/$contents" ]; then
|
||||||
echo " Descending into $contents..."
|
echo " Descending into $contents..."
|
||||||
local inner="$src_dir/$contents"
|
local inner="$src_dir/$contents"
|
||||||
|
shopt -s dotglob
|
||||||
mv "$inner"/* "$src_dir/"
|
mv "$inner"/* "$src_dir/"
|
||||||
rmdir "$inner"
|
shopt -u dotglob
|
||||||
|
rm -rf "$inner"
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
*.tar.gz|*.tgz)
|
*.tar.gz|*.tgz)
|
||||||
@@ -308,7 +310,7 @@ if [ ! -f "$CONF_FILE" ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
mkdir -p "$TMP_DIR"
|
mkdir -p "$TMP_DIR"
|
||||||
mkdir -p "$HOME/.local/state/HamPack"
|
mkdir -p "$HOME/.local/state/HamPackServer"
|
||||||
|
|
||||||
echo "Starting HamPack source builds..."
|
echo "Starting HamPack source builds..."
|
||||||
process_conf
|
process_conf
|
||||||
|
|||||||
15
install.sh
15
install.sh
@@ -28,10 +28,9 @@ print_logo
|
|||||||
cd ~
|
cd ~
|
||||||
sudo -v
|
sudo -v
|
||||||
|
|
||||||
# Keep sudo session alive for the duration of the script
|
# Extend sudo timeout for the duration of the install, clean up on exit
|
||||||
( while true; do sudo -v; sleep 60; done ) &
|
echo "Defaults timestamp_timeout=120" | sudo tee /etc/sudoers.d/99-hampack-install > /dev/null
|
||||||
SUDO_KEEPALIVE_PID=$!
|
trap "sudo rm -f /etc/sudoers.d/99-hampack-install" EXIT
|
||||||
trap "kill $SUDO_KEEPALIVE_PID" EXIT
|
|
||||||
|
|
||||||
if ! command -v git &> /dev/null; then
|
if ! command -v git &> /dev/null; then
|
||||||
echo "Installing git..."
|
echo "Installing git..."
|
||||||
@@ -47,11 +46,11 @@ fi
|
|||||||
|
|
||||||
echo "Getting the latest version of HamPackServer..."
|
echo "Getting the latest version of HamPackServer..."
|
||||||
rm -rf ~/.local/share/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
|
mkdir -p "$HOME/.local/bin"
|
||||||
cp $HOME/.local/share/HamPackServer/hampackserverrefresh $HOME/.local/bin/hampackserverrefresh
|
cp "$HOME/.local/share/HamPackServer/hampackserverrefresh" "$HOME/.local/bin/hampackserverrefresh"
|
||||||
cp $HOME/.local/share/HamPackServer/hampackserverupdate $HOME/.local/bin/hampackserverupdate
|
cp "$HOME/.local/share/HamPackServer/hampackserverupdate" "$HOME/.local/bin/hampackserverupdate"
|
||||||
|
|
||||||
cd ~/.local/share/HamPackServer
|
cd ~/.local/share/HamPackServer
|
||||||
|
|
||||||
|
|||||||
@@ -7,6 +7,5 @@ SERVERS=(
|
|||||||
UTILITIES=(
|
UTILITIES=(
|
||||||
nodejs
|
nodejs
|
||||||
npm
|
npm
|
||||||
nvm
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user