mirror of
https://github.com/YunoHost/vinaigrette.git
synced 2024-09-03 20:06:11 +02:00
Clean a few outdated things
This commit is contained in:
parent
15bd3cae36
commit
801e653979
2 changed files with 5 additions and 21 deletions
|
@ -5,6 +5,5 @@ package=$2
|
||||||
version=$3
|
version=$3
|
||||||
|
|
||||||
sudo apt-get update > /dev/null 1>&1
|
sudo apt-get update > /dev/null 1>&1
|
||||||
#apt-get -q --download-only --only-source -t $codename \
|
|
||||||
apt-get -q --download-only --only-source \
|
apt-get -q --download-only --only-source \
|
||||||
source ${package}=${version}
|
source ${package}=${version}
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
#!/bin/bash -p
|
#!/bin/bash -p
|
||||||
|
|
||||||
codename=$1
|
codename=$1
|
||||||
|
CODENAME=$1
|
||||||
package=$2
|
package=$2
|
||||||
version=$3
|
version=$3
|
||||||
arch=$4
|
arch=$4
|
||||||
|
@ -8,13 +9,6 @@ job=$5
|
||||||
|
|
||||||
source /home/vinaigrette/config/config
|
source /home/vinaigrette/config/config
|
||||||
source /home/vinaigrette/scripts/package_helpers.sh
|
source /home/vinaigrette/scripts/package_helpers.sh
|
||||||
XMPP_BOT_KEY=$(cat /home/vinaigrette/config/keys/xmppbotkey)
|
|
||||||
|
|
||||||
# Repository codename to add package to
|
|
||||||
CODENAME=
|
|
||||||
|
|
||||||
# Either adding package to rpi repo or not
|
|
||||||
ADD_TO_RPI=false
|
|
||||||
|
|
||||||
# Architecture independent packages are built on default arch
|
# Architecture independent packages are built on default arch
|
||||||
ARCH=$arch
|
ARCH=$arch
|
||||||
|
@ -28,12 +22,6 @@ DISTRIBUTION=$(get_distribution $CHANGES_FILE)
|
||||||
|
|
||||||
# Attempt to extract Debian codename from Distribution
|
# Attempt to extract Debian codename from Distribution
|
||||||
extract_codename_distribution $DISTRIBUTION || exit 1
|
extract_codename_distribution $DISTRIBUTION || exit 1
|
||||||
[ -z "$CODENAME" ] && CODENAME=$1
|
|
||||||
|
|
||||||
# Add to rpi
|
|
||||||
#if [[ $4 == all ]] && [[ $DISTRIBUTION != unstable ]]; then
|
|
||||||
# ADD_TO_RPI=true
|
|
||||||
#fi
|
|
||||||
|
|
||||||
# Retrieving component from source package
|
# Retrieving component from source package
|
||||||
get_source_component() {
|
get_source_component() {
|
||||||
|
@ -46,9 +34,9 @@ if [ -z "$COMPONENT" ]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo \
|
echo "#########################"
|
||||||
"******************************************************************************"
|
echo " Adding binary package..."
|
||||||
echo "Adding binary package..."
|
echo "#########################"
|
||||||
|
|
||||||
include_to() {
|
include_to() {
|
||||||
# Include changes to the given repo (waiting 1m max)
|
# Include changes to the given repo (waiting 1m max)
|
||||||
|
@ -57,11 +45,8 @@ include_to() {
|
||||||
$CHANGES_FILE > /dev/null 1>&1 || return 1
|
$CHANGES_FILE > /dev/null 1>&1 || return 1
|
||||||
}
|
}
|
||||||
|
|
||||||
status=0
|
|
||||||
if include_to $CODENAME ; then
|
if include_to $CODENAME ; then
|
||||||
if $ADD_TO_RPI; then
|
status=0
|
||||||
include_to "${CODENAME}/rpi" || status=1
|
|
||||||
fi
|
|
||||||
else
|
else
|
||||||
status=1
|
status=1
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Add table
Reference in a new issue