Miroirs/slackpkg
1
0
Fork 0
mirror of https://github.com/rworkman/slackpkg synced 2024-12-25 21:58:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #31 from piterpunk/detect_if_system_is_running_current

Browse source
This commit is contained in:
Piter Punk 2023-04-10 17:07:58 -03:00 committed by GitHub
commit a64693d900
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
files/core-functions.sh
View file

@ -64,6 +64,12 @@ function system_setup() {
# Create $WORKDIR just in case # Create $WORKDIR just in case
mkdir -p "${WORKDIR}" mkdir -p "${WORKDIR}"
# Set the "current" flag if system is running Slackware Current
if [ -n "$(echo $SLACKWARE_VERSION | sed -ne 's/.*\(+\|current\)$/\1/pi')" ] && \
[ ! -e ${WORKDIR}/current ]; then
touch ${WORKDIR}/current
fi
# Select the command to fetch files and packages from network sources # Select the command to fetch files and packages from network sources
if [ "$DOWNLOADER" = "curl" ]; then if [ "$DOWNLOADER" = "curl" ]; then
DOWNLOADER="curl ${CURLFLAGS} -o" DOWNLOADER="curl ${CURLFLAGS} -o"
@ -190,7 +196,7 @@ as example or overwrite it with slackpkg.conf.new.\n\
if [ "$ARCH" = "none" ] && [ "$CMD" != "new-config" ]; then if [ "$ARCH" = "none" ] && [ "$CMD" != "new-config" ]; then
echo -e "\ echo -e "\
\nThe ARCH values in slackpkg.conf are now different. You can remove\n\ \nThe ARCH values in slackpkg.conf are now different. You can remove\n\
ARCH from there, and slackpkg you use your current ARCH or you can look\n\ ARCH from there, and slackpkg will use your current ARCH or you can look\n\
at slackpkg.conf.new or slackpkg.conf manual page to see the new valid\n\ at slackpkg.conf.new or slackpkg.conf manual page to see the new valid\n\
ARCH values\n" ARCH values\n"
cleanup cleanup

6
files/slackpkg.conf.5
View file

@ -102,7 +102,11 @@ is /var/lib/slackpkg.
.B DOWNLOADER .B DOWNLOADER
.br .br
Selects the download application slackpkg will use to fetch files. Selects the download application slackpkg will use to fetch files.
Current options are \fBcurl\fR or \fBwget\fR. Default is wget. Current options are "curl" or "wget".
The default value of
.B DOWNLOADER
is "wget"
.TP 5 .TP 5
.B CURLFLAGS .B CURLFLAGS

4
files/slackpkg.conf.new
View file

@ -74,9 +74,7 @@ TEMP=/var/cache/packages
# Package lists, file lists, and others will be stored in WORKDIR: # Package lists, file lists, and others will be stored in WORKDIR:
WORKDIR=/var/lib/slackpkg WORKDIR=/var/lib/slackpkg
# Use curl or wget for Downloading (wget is default) # Use curl or wget for downloading (wget is default)
#DOWNLOADER=curl
DOWNLOADER=wget DOWNLOADER=wget
# Special options for curl # Special options for curl