Commit Graph

508 Commits

Author SHA1 Message Date
chess.griffin
749d776734 add exported ARCH to sbopkg.conf.new 2009-05-23 04:56:20 +00:00
chess.griffin
dfa5bd29ce add propset keywords to README-queuefiles and README-repos.d 2009-05-23 04:49:46 +00:00
chess.griffin
65feae6ed3 add README-queuefiles to /doc directory. 2009-05-23 04:44:05 +00:00
slakmagik
8fdf2e1361 fix vim modeline 2009-05-22 21:21:52 +00:00
chess.griffin
4a88fc9f65 add ability to build/install more than one queuefile from cli, e.g. $ sbopkg -b 'queue1 queue2' 2009-05-22 20:16:30 +00:00
chess.griffin
0dd4a6a668 modify queuefile format so now queuefiles are simply one 'APP' per line; deselected apps can be be indicated by prepending a '-' in front of the APP name, such as '-APP'; this should make using and sharing queuefiles easier and more intuitive; also update ChangeLog-current.txt 2009-05-22 14:33:29 +00:00
mauro.giachero
cf5963a290 search_package(): do not leak $PKG.
Before this patch, search_package leaked $PKG and in some
places the code actually made use of that. Since $PKG is the
unmodified first parameters of the function, there's really
no need to use the leaked value -- just use whatever was
put as first argument to the call.
As a side effect, probably some cosmetic bug got fixed,
since $PKG was also used in odd places.

Signed-off-by: Mauro Giachero <mauro.giachero@gmail.com>
2009-05-21 16:35:11 +00:00
mauro.giachero
d789a128e8 Invert can_skip_line() return value logic.
Code reading suggests that if "can_skip_line $FOO" is true,
the line can be skipped. Unfortunately, the code acts
backwards (if the function returns 0, the line _can't_ be
skipped).
Invert the function return logic so to make the code less
confusing.

Signed-off-by: Mauro Giachero <mauro.giachero@gmail.com>
2009-05-21 16:34:59 +00:00
mauro.giachero
b43772cb7a Remove load_backup_queue().
This function is unused since a long time, and likely won't
be used anytime soon, so delete it.

Signed-off-by: Mauro Giachero <mauro.giachero@gmail.com>
2009-05-21 16:34:46 +00:00
mauro.giachero
77534078e3 Do not use the ARCH variable.
ARCH is a special name for SlackBuilds, and it will get even
more important now that Slackware is going to support x86_64.
This patch makes sure sbopkg doesn't use it internally any
more.

Signed-off-by: Mauro Giachero <mauro.giachero@gmail.com>
2009-05-21 16:34:34 +00:00
mauro.giachero
cf78790cc0 git support: add ChangeLog.txt.
Since git repositories track the whole history of a project,
there's no point in maintaining a change log for them. Sbopkg
expects one nevertheless, since it's historically rsync
oriented.
This patch adds the little code needed to automatically
generate a meaningful ChangeLog.txt from the project history.

Signed-off-by: Mauro Giachero <mauro.giachero@gmail.com>
2009-05-21 16:34:21 +00:00
mauro.giachero
30ad5a995d Fix '-s' command line switch.
The '-s' switch got broken, mainly because it used "leaking"
variables. Give it a proper interface, and use that.
Also, properly check for search failures.

Signed-off-by: Mauro Giachero <mauro.giachero@gmail.com>
2009-05-21 16:34:09 +00:00
chess.griffin
e3421a6bd5 update ChangeLog-current.txt 2009-05-21 13:24:50 +00:00
mauro.giachero
9ee548f2c3 Refactor get_source() a bit.
Signed-off-by: Mauro Giachero <mauro.giachero@gmail.com>
2009-05-21 08:51:04 +00:00
mauro.giachero
1d47dfab92 Rework source checking.
David Spencer reported on the ML that the current sbopkg
behavior of checking the MD5 only just after the download
breaks some (bad) applications, like Google Earth, which
don't change the source file name on version upgrades.

This patch puts an additional check for existing sources,
so to workaround this issue (at the expense of extra MD5
checks for all other good applications). Moreover, add an
option to retry the download, which comes handy with the
aforementioned bad applications since otherwise the user had
to start the build twice (the first time he sees a failed
MD5 check and has the option to delete the downloaded file,
and the second time the source gets downloaded again).

Signed-off-by: Mauro Giachero <mauro.giachero@gmail.com>
2009-05-21 08:08:01 +00:00
mauro.giachero
50c293ff1e Fix queue processing.
Signed-off-by: Mauro Giachero <mauro.giachero@gmail.com>
2009-05-21 08:07:51 +00:00
mauro.giachero
da958c527d Improve file cleanup for search-related functions.
This patch revisits some cleanup path, and makes sure that
the temporary files are deleted where appropriate.

Signed-off-by: Mauro Giachero <mauro.giachero@gmail.com>
2009-05-21 08:07:40 +00:00
mauro.giachero
d8a74980be Cleanup gen_search_package().
This patch replaces some wrong 'continue' statements with
'return 0' (which is functionally equivalent on all call
sites), merging some of them at the end of the function.

Signed-off-by: Mauro Giachero <mauro.giachero@gmail.com>
2009-05-21 08:07:30 +00:00
mauro.giachero
a24462f13f Use return values to implement the jump back to the main menu.
sbopkg 'touch'es a file (sbopkg_return_main_menu) to track
that the user asked to jump back to the main menu from a
"deep" menu level (such as info_item).
This patch converts it to the usage of function return values,
which makes the code smaller and easier to read.

Signed-off-by: Mauro Giachero <mauro.giachero@gmail.com>
2009-05-21 08:07:19 +00:00
mauro.giachero
31ce00b3d1 Sanity check $SBOPKGTMP.
Since we do many file operations in $SBOPKGTMP, including
some 'rm -rf', check its content on startup to make sure no
user files are mistakenly in there.

Signed-off-by: Mauro Giachero <mauro.giachero@gmail.com>
2009-05-21 08:07:09 +00:00
mauro.giachero
bd057d45e4 Cleanup {edit,delete,pick}_local_{info,SlackBuild}() and more.
This patch removes some code duplication and modifies some
detail about the EDITOR, PAGER and HAS_NCURSES variables.

Signed-off-by: Mauro Giachero <mauro.giachero@gmail.com>
2009-05-21 08:06:57 +00:00
mauro.giachero
b4cef20b18 Add the museek-plus->museek+ rename.
Signed-off-by: Mauro Giachero <mauro.giachero@gmail.com>
2009-05-21 08:06:46 +00:00
chess.griffin
5da74910d6 enforce '.sboq.' extension to queuefiles; also, if argument passed at cli is the name of a queuefile and a package, ask user which one he wants to use 2009-05-20 12:51:16 +00:00
chess.griffin
c39e7e2b1b fix typo to man page 2009-05-18 19:40:28 +00:00
chess.griffin
cb8eb52669 update both man pages; these man pages might need more tweaking but there were a couple of things I had been wanting to fix/update in the meantime 2009-05-18 19:38:20 +00:00
chess.griffin
1fcce2efe8 update some of the items in /docs 2009-05-18 19:32:00 +00:00
mauro.giachero
6a186e9d8b New repository layout implementation.
This patch introduces a new repos.d directory containing
all the definitions of repository branches. This way the
supported repositories can be extended without modifying
the default configuration files, which causes problems on
version updates.
Thanks to Chess Griffin for his efforts in planning this
feature and reviewing the implementation.

Signed-off-by: Mauro Giachero <mauro.giachero@gmail.com>
2009-05-18 09:03:18 +00:00
chess.griffin
dde83edea8 update trunk ChangeLog.txt 2009-05-16 05:00:29 +00:00
chess.griffin
a125d260fc undo last commit; man pages were accidentally update 2009-05-16 05:00:01 +00:00
chess.griffin
30da6c2a1f update trunk ChangeLog.txt 2009-05-16 04:51:00 +00:00
chess.griffin
238fbc0372 remove sbopkg-renames.new from doinst.sh 2009-05-16 04:38:47 +00:00
chess.griffin
0a6d282289 tweak the output of the summary log 2009-05-16 04:26:32 +00:00
chess.griffin
2ced9364a4 do not show files that end in '~' in queue dir lister; when importing lines from a user queue, check and skip blank lines and comment lines; fix view_queue call when using 'Process' button in queue menu 2009-05-14 20:36:50 +00:00
chess.griffin
fe357d64e4 more process_queue cleanups 2009-05-14 19:47:23 +00:00
chess.griffin
6bd48b9f8a modify the log a bit; add some counters; move one more bit (the echos at end of build_package) to the caller; change the build/install dialog to a 'yes/no' dialog per Mauro's suggestion 2009-05-14 16:27:54 +00:00
chess.griffin
07c263c203 rework the whole process_queue and related functions; this patch attempts to properly handle certain items by the caller instead of in the called function; it also does away with the INSTALLPKGS and BUILDPKGS toggles; the logging is cleaned up and improved; and various other FIXMEs and tweaks are made along the way. 2009-05-14 14:06:44 +00:00
chess.griffin
0ff2ee1f91 try and fix svn revision propset on sbopkg; take 2 2009-05-12 19:28:15 +00:00
chess.griffin
ef23192fd2 try and fix svn revision propset on sbopkg 2009-05-12 19:27:44 +00:00
chess.griffin
29f239fc43 modify sbopkg.SlackBuilds to include new renames.d directory 2009-05-12 18:21:39 +00:00
chess.griffin
516c681183 add support for new *.txz, *.tbz, and *.tlz Slackware package extensions. 2009-05-12 14:03:29 +00:00
mauro.giachero
99b16afbeb Fix a couple of "Build and Install" bugs.
Spotted and fixed by Chess Griffin.
2009-05-12 07:37:32 +00:00
chess.griffin
606890dbfe update both ChangeLogs 2009-05-11 17:51:07 +00:00
chess.griffin
f6e81fa444 apply SVN propset to 50-default 2009-05-08 21:51:40 +00:00
mauro.giachero
3078f984fa Implement renames tracking using a configuration directory.
Modify the renames tracking so that, instead of a single
file, all the files of a renames.d directory are used (just
like udev and modprobe do).
This has several advantages:
- no more need to "mv sbopkg-renames.new sbopkg-renames"
- it's now easier to add custom renames that automatically
  "survive" version upgrades
and, last but not least, this is believed to be the correct
way to handle these things.

Many thanks are due to Robby Workman for proposing this
change and to Chess Griffin for implementing it.
2009-05-08 08:39:37 +00:00
mauro.giachero
91db815094 Fix package building by making two more variables global.
The giant cleanup broke package building by marking "too
many" variables as local. These two are actually used
elsewhere, so just make them global.

Thanks to Chess Griffin for this fix.
2009-05-07 10:14:30 +00:00
mauro.giachero
3ddf3a7067 Fix per-user SLACKVER setting.
If the user ever created a personal sbopkg.conf file not
containing the SLACKVER=... line, the old code would not
add it.
This patch fixes the code by removing the assignment if it
exists, and then unconditionally adding the new one at the
end.

Signed-off-by: Mauro Giachero <mauro.giachero@gmail.com>
2009-05-07 10:14:19 +00:00
mauro.giachero
449e2371a9 Fix local repo test.
This change got lost when resolving some merge conflict :-/.

Signed-off-by: Mauro Giachero <mauro.giachero@gmail.com>
2009-05-07 10:14:08 +00:00
mauro.giachero
3d98703b9d Do not unset SBOPKG_CONF at startup.
SBOPKG_CONF shouldn't be unset at startup, because we want
to be able to override the default config file name with it.

Signed-off-by: Mauro Giachero <mauro.giachero@gmail.com>
2009-05-07 10:13:54 +00:00
mauro.giachero
7fabdd8f97 'Nice' the build process.
Give a lower priority to the build process, so that sbopkg
becomes less a resource hog when left working in background.

Signed-off-by: Mauro Giachero <mauro.giachero@gmail.com>
2009-05-07 10:13:41 +00:00
chess.griffin
ea887535c4 undo last change; that was not the solution to why renames is not working 2009-05-06 18:26:10 +00:00