zawz/zpkg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix install + implement TMPDIR

Browse source
This commit is contained in:
zawz 2020-07-07 13:40:50 +02:00
parent 10b364e560
commit 73646e39e8
9 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
server_deploy.sh
View file

@ -2,6 +2,8 @@
. "$(pwd)/.config"
[ -z "$TMPDIR" ] && TMPDIR=/tmp
[ -z "$COMPRESSION" ] && COMPRESSION="xz:xz:pixz"
extension=$(echo "$COMPRESSION" | cut -d':' -f1)
compress=$(echo "$COMPRESSION" | cut -d':' -f2)
@ -25,7 +27,7 @@ scp .config server_scripts/* "$SSH_ADDRESS":~/ || exit $?
PKG=zpkg
DEST=/usr/bin
BASHDEST=/etc/bash_completion.d
tmpdir="/tmp/zpkg$(random_string 5)"
tmpdir="$TMPDIR/zpkg$(random_string 5)"
fullpath="$tmpdir/$PKG/ROOT"
# setup package sources
mkdir -p "$fullpath$DEST" || exit $?

4
server_scripts/database_update.sh
View file

@ -2,6 +2,8 @@
. "$(pwd)/.config"
[ -z "$TMPDIR" ] && TMPDIR=/tmp
# resolve compression
[ -z "$COMPRESSION" ] && COMPRESSION="xz:xz:pixz"
extension=$(echo "$COMPRESSION" | cut -d':' -f1)
@ -38,7 +40,7 @@ do
done
# remove inexistant
tmpfile="/tmp/pkglist_$(tr -cd '[:alnum:]' </dev/urandom | head -c10)"
tmpfile="$TMPDIR/pkglist_$(tr -cd '[:alnum:]' </dev/urandom | head -c10)"
awk '{print $1}' pkglist | sort > "$tmpfile"
for I in $(echo "$fulllist" | sort | diff --new-line-format="" --unchanged-line-format="" "$tmpfile" -)
do

12
server_scripts/gen_install.sh
View file

@ -11,6 +11,8 @@ cat .config >> install.sh
# body
echo '
[ -z "$TMPDIR" ] && TMPDIR=/tmp
# resolve compression
[ -z "$COMPRESSION" ] && COMPRESSION="xz:xz:pixz"
extension=$(echo "$COMPRESSION" | cut -d":" -f1)
@ -65,22 +67,20 @@ else
fi
# Generate conf file
$sudo sh -c "{
echo "# zpkg config file
$sudo sh -c "echo \"# zpkg config file
SSH_ADDRESS=$SSH_ADDRESS
HTTP_ADDRESS=$HTTP_ADDRESS
COMPRESSION=$COMPRESSION
PKG_PATH=pkg"
PKG_PATH=pkg
ALLOW_ROOT=false
UPDATE_REMOVE=true
} > zpkg.conf"
UPDATE_REMOVE=true\" > zpkg.conf"
# install config file
$sudo mkdir -p "$config_path" || exit $?
$sudo mv zpkg.conf "$config_path" || exit $?
# download zpkg
tmpdir=/tmp/zpkg$(tr -cd "[:alnum:]" < /dev/urandom | head -c5)
tmpdir=$TMPDIR/zpkg$(tr -cd "[:alnum:]" < /dev/urandom | head -c5)
mkdir -p "$tmpdir" || exit $?
(
cd "$tmpdir" || exit $?

4
src/deploy.sh
View file

@ -10,7 +10,7 @@ package()
unset tmpdir
if [ ! -d "$src/ROOT" ] && [ ! -d "$src/HOME" ] && [ ! -f "$src/DEPS" ] && [ ! -f "$src/DESC" ]
then
tmpdir="/tmp/zpkg_$(random_string 5)"
tmpdir="$TMPDIR/zpkg_$(random_string 5)"
mkdir -p "$tmpdir"
cp -r "$src" "$tmpdir/ROOT"
src="$tmpdir"
@ -47,7 +47,7 @@ deploy_folder()
deploy_package "$1" "$1" || return $?
elif [ -d "$1" ] # folder
then
tmpdirar="/tmp/zpkg_$(random_string 5)"
tmpdirar="$TMPDIR/zpkg_$(random_string 5)"
mkdir -p "$tmpdirar"
archive="$(getname "$1").tar.$extension"
package "$1" "$tmpdirar/$archive" || return $?

2
src/env.sh
View file

@ -7,3 +7,5 @@ config_path=/etc/zpkg
fname="$(basename "$0")"
ALLOW_ROOT=false
UPDATE_REMOVE=true
[ -z "$TMPDIR" ] && TMPDIR=/tmp

2
src/install.sh
View file

@ -30,7 +30,7 @@ install_package()
{
[ "$1" = "$fname" ] && [ -z "$opt_R" ] && _self_update=y && return 0
echo "Installing $1"
tmpdir="/tmp/zpkg_$(random_string 5)"
tmpdir="$TMPDIR/zpkg_$(random_string 5)"
mkdir -p "$tmpdir"
(
cd "$tmpdir"

4
src/main.sh
View file

@ -107,14 +107,14 @@ update)
fi
;;
list-outdated)
tmpdir="/tmp/zpkg_$(random_string 5)"
tmpdir="$TMPDIR/zpkg_$(random_string 5)"
virtual_config_path "$tmpdir" || exit $?
fetch_pkglist > /dev/null || exit $?
outdated_packages
rm -rd "$tmpdir"
;;
list-removed)
tmpdir="/tmp/zpkg_$(random_string 5)"
tmpdir="$TMPDIR/zpkg_$(random_string 5)"
virtual_config_path "$tmpdir" || exit $?
fetch_pkglist > /dev/null || exit $?
removed_packages

2
src/print.sh
View file

@ -42,7 +42,7 @@ error() {
# $1 = package name
package_info() {
# prepare
tmpdir="/tmp/zpkg_$(random_string 5)"
tmpdir="$TMPDIR/zpkg_$(random_string 5)"
mkdir -p "$tmpdir" || return $?
pwd="$(pwd)"
cd "$tmpdir"

4
src/upgrade.sh
View file

@ -16,7 +16,7 @@ upgrade_package()
{
[ "$1" = "$fname" ] && [ -z "$opt_R" ] && _self_update=y && return 0
echo "Updating $1"
tmpdir="/tmp/zpkg_$(random_string 5)"
tmpdir="$TMPDIR/zpkg_$(random_string 5)"
mkdir -p "$tmpdir"
(
# fetch package
@ -43,7 +43,7 @@ upgrade_package()
unset _self_update
gen_self_update()
{
_tmpzpkg="/tmp/zpkg_bin_$(random_string 5)"
_tmpzpkg="$TMPDIR/zpkg_bin_$(random_string 5)"
# copy current file
cp "$0" "$_tmpzpkg" || return $?
# make new script self-delete