gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-18 20:10:29 +01:00
Code Issues Projects Releases Wiki Activity

Replace GNUSTEP_USER_ROOT environment variable with WMAKER_USER_ROOT

Browse Source 
As reported in Debian bug #922284 [1]:

    As evident from the prefix, GNUSTEP_USER_ROOT is a GNUstep variable and
    Window Maker should not set it.  Furthemore, it has been deprecated for
    12 years already.  As of gnustep-make/2.7.0-4 the GNUstep build system
    is configured in strict v2 mode which makes it impossible to compile
    GNUstep software.  In a terminal started from a Window Maker session:

    yavor@aneto:/tmp/gorm.app-1.2.24$ make
    This is gnustep-make 2.7.0. Type 'make print-gnustep-make-help' for help.
    Running in gnustep-make version 2 strict mode.
    rm -f InterfaceBuilder; \
    ln -s GormLib InterfaceBuilder
    /usr/share/GNUstep/Makefiles/config-noarch.make:121: *** GNUSTEP_USER_ROOT
    is obsolete.  Stop.

    It is also impossible to build gnustep-make from pristine upstream
    source:

    yavor@aneto:/tmp$ wget -q
      ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-2.7.0.tar.gz
    yavor@aneto:/tmp$ tar xzf gnustep-make-2.7.0.tar.gz
    yavor@aneto:/tmp$ cd gnustep-make-2.7.0/
    yavor@aneto:/tmp/gnustep-make-2.7.0$ ./configure
    ...
    yavor@aneto:/tmp/gnustep-make-2.7.0$ make
    config-noarch.make:121: *** GNUSTEP_USER_ROOT is obsolete.  Stop.

    Note that the majority of GNUstep users use Window Maker as their window
    manager and many of them build GNUstep software from source, mostly
    because of the GNUstep Objective-C runtime which depends on Clang
    (Debian packages use GCC and the GCC/GNU runtime).

Our solution is to replace the GNUSTEP_USER_ROOT environment variable with our
own environment variable, WMAKER_USER_ROOT.  This is documented in NEWS.

[1] https://bugs.debian.org/922284
This commit is contained in:
Doug Torrance
2019-02-15 18:49:49 -05:00
committed by Carlos R. Mafra
parent 1dace5699f
commit 738a78b3e2
36 changed files with 79 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
NEWS
View File

@@ -1,6 +1,17 @@
NEWS for veteran Window Maker users
-----------------------------------
-- 0.95.9
New user configuration directory environment variable
-----------------------------------------------------
In previous versions, the GNUstep directory used to store a user's Window Maker
configuration files was specified by the GNUSTEP_USER_ROOT environment variable,
which defaulted to ~/GNUstep. However, this environment variable was deprecated
in gnustep-make v2. Therefore, it has been replaced by the WMAKER_USER_ROOT
environment variable.
-- 0.95.8
Move pointer with maximized windows

4
WINGs/po/fy.po
View File

@@ -388,8 +388,8 @@ msgid "Could not create component %s"
msgstr "Koe komponint %s net oanmeitsje"
#: ../../WINGs/userdefaults.c:72
msgid "variable GNUSTEP_USER_ROOT defined with invalid path, not used"
msgstr "fariabele GNUSTEP_USER_ROOT, definiearre mei ûnjildich paad, net brûkt"
msgid "variable WMAKER_USER_ROOT defined with invalid path, not used"
msgstr "fariabele WMAKER_USER_ROOT, definiearre mei ûnjildich paad, net brûkt"
#. something happened with the file. just overwrite it
#: ../../WINGs/userdefaults.c:210 ../../WINGs/userdefaults.c:225

4
WINGs/po/hu.po
View File

@@ -197,8 +197,8 @@ msgid "Could not create component %s"
msgstr "Nem sikerült létrehozni a %s elemet"
#: ../../../wmaker-crm/WINGs/userdefaults.c:65
msgid "variable GNUSTEP_USER_ROOT defined with invalid path, not used"
msgstr "A GNUSTEP_USER_ROOT változó be van állítva, de rossz értékre. Nem használom"
msgid "variable WMAKER_USER_ROOT defined with invalid path, not used"
msgstr "A WMAKER_USER_ROOT változó be van állítva, de rossz értékre. Nem használom"
#. something happened with the file. just overwrite it
#: ../../../wmaker-crm/WINGs/userdefaults.c:196

4
WINGs/po/nl.po
View File

@@ -389,9 +389,9 @@ msgid "Could not create component %s"
msgstr "Kon component %s niet aanmaken"
#: ../../WINGs/userdefaults.c:72
msgid "variable GNUSTEP_USER_ROOT defined with invalid path, not used"
msgid "variable WMAKER_USER_ROOT defined with invalid path, not used"
msgstr ""
"variabele GNUSTEP_USER_ROOT, gedefinieerd met ongeldig pad, niet gebruikt"
"variabele WMAKER_USER_ROOT, gedefinieerd met ongeldig pad, niet gebruikt"
#. something happened with the file. just overwrite it
#: ../../WINGs/userdefaults.c:210 ../../WINGs/userdefaults.c:225

8
WINGs/proplist.c
View File

@@ -1731,7 +1731,7 @@ Bool WMWritePropListToFile(WMPropList * plist, const char *path)
* file, and the last component is stripped off. the rest is the
* the hierarchy to be created.
*
* refuses to create anything outside $GNUSTEP_USER_ROOT
* refuses to create anything outside $WMAKER_USER_ROOT
*
* returns 1 on success, 0 on failure
*/
@@ -1742,7 +1742,7 @@ int wmkdirhier(const char *path)
size_t p, plen;
struct stat st;
/* Only create directories under $GNUSTEP_USER_ROOT */
/* Only create directories under $WMAKER_USER_ROOT */
if ((t = wusergnusteppath()) == NULL)
return 0;
if (strncmp(path, t, strlen(t)) != 0)
@@ -1823,7 +1823,7 @@ static int wrmdirhier_fn(const char *path, const struct stat *st,
/*
* remove a directory hierarchy
*
* refuses to remove anything outside $GNUSTEP_USER_ROOT
* refuses to remove anything outside $WMAKER_USER_ROOT
*
* returns 1 on success, 0 on failure
*
@@ -1837,7 +1837,7 @@ int wrmdirhier(const char *path)
int error;
const char *t;
/* Only remove directories under $GNUSTEP_USER_ROOT */
/* Only remove directories under $WMAKER_USER_ROOT */
if ((t = wusergnusteppath()) == NULL)
return EPERM;
if (strncmp(path, t, strlen(t)) != 0)

6
WINGs/userdefaults.c
View File

@@ -59,9 +59,9 @@ const char *wusergnusteppath()
return path;
#ifdef HAVE_SECURE_GETENV
gspath = secure_getenv("GNUSTEP_USER_ROOT");
gspath = secure_getenv("WMAKER_USER_ROOT");
#else
gspath = getenv("GNUSTEP_USER_ROOT");
gspath = getenv("WMAKER_USER_ROOT");
#endif
if (gspath) {
gspath = wexpandpath(gspath);
@@ -69,7 +69,7 @@ const char *wusergnusteppath()
path = gspath;
return path;
}
wwarning(_("variable GNUSTEP_USER_ROOT defined with invalid path, not used"));
wwarning(_("variable WMAKER_USER_ROOT defined with invalid path, not used"));
}
h = wgethomedir();

4
WINGs/wapplication.c
View File

@@ -140,7 +140,7 @@ char *WMPathForResourceOfType(const char *resource, const char *ext)
* Paths are searched in this order:
* - resourcePath/ext
* - dirname(argv[0])/ext
* - GNUSTEP_USER_ROOT/Applications/ApplicationName.app/ext
* - WMAKER_USER_ROOT/Applications/ApplicationName.app/ext
* - ~/GNUstep/Applications/ApplicationName.app/ext
* - GNUSTEP_LOCAL_ROOT/Applications/ApplicationName.app/ext
* - /usr/local/GNUstep/Applications/ApplicationName.app/ext
@@ -175,7 +175,7 @@ char *WMPathForResourceOfType(const char *resource, const char *ext)
if (snprintf(appdir, slen, "Applications/%s.app", WMApplication.applicationName) >= slen)
goto out;
path = checkFile(getenv("GNUSTEP_USER_ROOT"), appdir, ext, resource);
path = checkFile(getenv("WMAKER_USER_ROOT"), appdir, ext, resource);
if (path)
goto out;

2
WindowMaker/menu.fy.in
View File

@@ -76,7 +76,7 @@
*
* // Brûk #usergnusteppath# as tydlike oantsjutting foar it paad nei de
* // brûkers-GNUstep-map. Window Maker sil dy ferfange mei de wearde
* // fan GNUSTEP_USER_ROOT, at dizze omjouwingsfariabele ynsteld is, of
* // fan WMAKER_USER_ROOT, at dizze omjouwingsfariabele ynsteld is, of
* // oars "~/GNUstep"
*
* <Parameters> is it út te fieren programma.

2
WindowMaker/menu.in
View File

@@ -76,7 +76,7 @@
*
* // Use #usergnusteppath# as a placeholder for the path to the user
* // GNUstep directory. Window Maker will replace this with the value
* // of GNUSTEP_USER_ROOT, if this environment variable is set, or
* // of WMAKER_USER_ROOT, if this environment variable is set, or
* // "~/GNUstep" otherwise
*
* <Parameters> is the program to execute.

2
WindowMaker/menu.nl.in
View File

@@ -76,7 +76,7 @@
*
* // Gebruik #usergnusteppath# als tijdelijke aanduiding voor het pad naar de
* // gebruikers-GNUstep-map. Window Maker zal die vervangen met de waarde
* // van GNUSTEP_USER_ROOT, als deze omgevingsvariabele is ingesteld, of
* // van WMAKER_USER_ROOT, als deze omgevingsvariabele is ingesteld, of
* // anders "~/GNUstep"
*
* <Parameters> is het uit te voeren programma.

4
debian/debianfiles/wmaker vendored
View File

@@ -2,8 +2,8 @@
set -e
[ -n "$GNUSTEP_USER_ROOT" ] || export GNUSTEP_USER_ROOT="$HOME/GNUstep"
gs_base="$GNUSTEP_USER_ROOT"
[ -n "$WMAKER_USER_ROOT" ] || export WMAKER_USER_ROOT="$HOME/GNUstep"
gs_base="$WMAKER_USER_ROOT"
gs_defaults="$gs_base/Defaults"
gs_system_defaults=/etc/GNUstep/Defaults
wm_base="$gs_base/Library/WindowMaker"

4
doc/cs/geticonset.1
View File

@@ -18,12 +18,12 @@ vyp
.B \-\-version
vyp<EFBFBD><EFBFBD>e <20><>slo verze
.SH PROM<EFBFBD>NN<EFBFBD> PROST<EFBFBD>ED<EFBFBD>
.IP GNUSTEP_USER_ROOT
.IP WMAKER_USER_ROOT
specifikuje cestu k adres<65><73>i Defaults. <20>et<65>zec "Defaults/" je p<>id<69>n k t<>to
prom<EFBFBD>nn<EFBFBD>, <20><>m<EFBFBD> se ur<75><72> um<75>st<73>n<EFBFBD> datab<61>z<EFBFBD>. Jakmile prom<6F>nn<6E> nen<65> nastaven<65>,
tak jej<65> implicitn<74> hodnota je "~/GNUstep"
.SH SOUBORY
.IP GNUSTEP_USER_ROOT/Defaults/WMWindowAttributes
.IP WMAKER_USER_ROOT/Defaults/WMWindowAttributes
Toto je soubor, kter<65> se zap<61><70>e.
.SH POD<EFBFBD>VEJTE SE TAK<EFBFBD>
.BR seticons (1),

4
doc/cs/getstyle.1
View File

@@ -50,12 +50,12 @@ Tato volba je v¾dy nastavená, jakmile je pou¾itá volba \-p.
vytvoøí balík s tématem v adresáøi nazvaným podla jména tématu s pøíponou .themed.
.SH PROMÌNNÉ PROSTØEDÍ
.IP GNUSTEP_USER_ROOT
.IP WMAKER_USER_ROOT
specifikuje cestu k adresáøi Defaults. Øetìzec "Defaults/" je pøidán k této
promìnné, èím¾ se urèí umístìní databází. Jakmile promìnná není nastavená,
tak její implicitní hodnota je "~/GNUstep"
.SH SOUBORY
.IP GNUSTEP_USER_ROOT/Defaults/WindowMaker
.IP WMAKER_USER_ROOT/Defaults/WindowMaker
Toto je soubor, který se zapí¹e.
.SH PODÍVEJTE SE TAKÉ
.BR setstyle (1),

4
doc/cs/seticons.1
View File

@@ -20,12 +20,12 @@ vyp
.B \-\-version
vyp<EFBFBD><EFBFBD>e <20><>slo verze
.SH PROM<EFBFBD>NN<EFBFBD> PROST<EFBFBD>ED<EFBFBD>
.IP GNUSTEP_USER_ROOT
.IP WMAKER_USER_ROOT
specifikuje cestu k adres<65><73>i Defaults. <20>et<65>zec "Defaults/" je p<>id<69>n k t<>to
prom<EFBFBD>nn<EFBFBD>, <20><>m<EFBFBD> se ur<75><72> um<75>st<73>n<EFBFBD> datab<61>z<EFBFBD>. Jakmile prom<6F>nn<6E> nen<65> nastaven<65>,
tak jej<65> implicitn<74> hodnota je "~/GNUstep"
.SH SOUBORY
.IP GNUSTEP_USER_ROOT/Defaults/WMWindowAttributes
.IP WMAKER_USER_ROOT/Defaults/WMWindowAttributes
Toto je soubor, kter<65> se zap<61><70>e.
.SH POD<EFBFBD>VEJTE SE TAK<EFBFBD>
.BR geticonset (1),

4
doc/cs/setstyle.1
View File

@@ -38,12 +38,12 @@ vypí¹e nápovìdu
.B \-\-version
vypí¹e èíslo verze
.SH PROMìNNÉ PROSTØEDÍ
.IP GNUSTEP_USER_ROOT
.IP WMAKER_USER_ROOT
specifikuje cestu k adresáøi Defaults. Øetìzec "Defaults/" je pøidán k této
promìnné, èím¾ se urèí umístìní databází. Jakmile promìnná není nastavená,
tak její implicitní hodnota je "~/GNUstep"
.SH SOUBORY
.IP GNUSTEP_USER_ROOT/Defaults/WindowMaker
.IP WMAKER_USER_ROOT/Defaults/WindowMaker
Toto je soubor, který se zapí¹e.
.SH PODÍVEJTE SE TAKÉ
.BR getstyle (1),

4
doc/cs/wdwrite.1
View File

@@ -23,12 +23,12 @@ vyp
.B \-\-version
vyp<EFBFBD><EFBFBD>e <20><>slo verze
.SH PROM<EFBFBD>NN<EFBFBD> PROST<EFBFBD>ED<EFBFBD>
.IP GNUSTEP_USER_ROOT
.IP WMAKER_USER_ROOT
specifikuje cestu k adres<65><73>i Defaults. <20>et<65>zec "Defaults/" je p<>id<69>n k t<>to
prom<EFBFBD>nn<EFBFBD>, <20><>m<EFBFBD> se ur<75><72> um<75>st<73>n<EFBFBD> datab<61>z<EFBFBD>. Jakmile prom<6F>nn<6E> nen<65> nastaven<65>,
tak jej<65> implicitn<74> hodnota je "~/GNUstep"
.SH SOUBORY
Dom<EFBFBD>ny se nach<63>zej<65> v GNUSTEP_USER_ROOT/Defaults/
Dom<EFBFBD>ny se nach<63>zej<65> v WMAKER_USER_ROOT/Defaults/
.SH POD<EFBFBD>VEJTE SE TAK<EFBFBD>
.BR wmaker (1)
.SH AUTOR

2
doc/cs/wmaker.1
View File

@@ -110,7 +110,7 @@ Styly spolo
.B /usr/share/WindowMaker/Themes/
A te<74> to zkuste sami... ;-)
.SH PROM<EFBFBD>NN<EFBFBD> PROS<EFBFBD>ED<EFBFBD>
.IP GNUSTEP_USER_ROOT
.IP WMAKER_USER_ROOT
specifikuje cestu k adres<65><73>i Defaults. "Defaults/" je p<>id<69>n k t<>to
prom<EFBFBD>nn<EFBFBD>, <20><>m<EFBFBD> se ur<75><72> um<75>st<73>n<EFBFBD> datab<61>z<EFBFBD>. Pokud prom<6F>nn<6E> nen<65> nastaven<65>,
ta jej<65> implicitn<74> hodnota je "~/GNUstep"

4
doc/geticonset.1
View File

@@ -20,12 +20,12 @@ print a help message with the list of options
.B \-\-version
print the version of Window Maker from which the program comes
.SH ENVIRONMENT
.IP GNUSTEP_USER_ROOT
.IP WMAKER_USER_ROOT
specifies the initial path for the Defaults directory. "Defaults/" is
appended to this variable to determine the actual location of the
databases. If the variable is not set, it defaults to "~/GNUstep"
.SH FILES
.IP GNUSTEP_USER_ROOT/Defaults/WMWindowAttributes
.IP WMAKER_USER_ROOT/Defaults/WMWindowAttributes
is the actual file that's read.
.SH SEE ALSO
.BR seticons (1),

4
doc/getstyle.1
View File

@@ -55,12 +55,12 @@ along with any user-definable mouse cursor settings
that are present.
.SH ENVIRONMENT
.IP GNUSTEP_USER_ROOT
.IP WMAKER_USER_ROOT
specifies the initial path for the Defaults directory. "Defaults/" is
appended to this variable to determine the actual location of the
databases. If the variable is not set, it defaults to "~/GNUstep"
.SH FILES
.IP GNUSTEP_USER_ROOT/Defaults/WindowMaker
.IP WMAKER_USER_ROOT/Defaults/WindowMaker
This is the actual file that gets written.
.SH SEE ALSO
.BR setstyle (1),

4
doc/ru/geticonset.1
View File

@@ -18,12 +18,12 @@ geticonset \- считывает данные о наборе иконок Windo
.B \-\-version
Выводит номер версии.
.SH "ОКРУЖЕНИЕ"
.IP GNUSTEP_USER_ROOT
.IP WMAKER_USER_ROOT
Указывает начальный путь к папке Defaults. "Defaults/" приписывается к этой
переменной, чтобы определить настоящее расположение данных. Если переменная не
установлена, то её значение: "~/GNUstep".
.SH "ФАЙЛЫ"
.IP GNUSTEP_USER_ROOT/Defaults/WMWindowAttributes
.IP WMAKER_USER_ROOT/Defaults/WMWindowAttributes
Файл, из которого читаются данные.
.SH "СМОТРИ ТАКЖЕ"
.BR seticons (1),

4
doc/ru/getstyle.1
View File

@@ -50,12 +50,12 @@ getstyle \- делает дамп темы оформления Window Maker.
суффикса .themed.
.SH "ОКРУЖЕНИЕ"
.IP GNUSTEP_USER_ROOT
.IP WMAKER_USER_ROOT
Указывает начальный путь к папке Defaults. "Defaults/" приписывается к этой
переменной, чтобы определить настоящее расположение данных. Если переменная не
установлена, то её значение: "~/GNUstep".
.SH "ФАЙЛЫ"
.IP GNUSTEP_USER_ROOT/Defaults/WindowMaker
.IP WMAKER_USER_ROOT/Defaults/WindowMaker
В указанный файл идёт запись данных.
.SH "СМОТРИ ТАКЖЕ"
.BR setstyle (1),

4
doc/ru/seticons.1
View File

@@ -20,12 +20,12 @@ seticons \- устанавливает набор иконок Window Maker.
.B \-\-version
Выводит номер версии.
.SH "ОКРУЖЕНИЕ"
.IP GNUSTEP_USER_ROOT
.IP WMAKER_USER_ROOT
Указывает начальный путь к папке Defaults. "Defaults/" приписывается к этой
переменной, чтобы определить настоящее расположение данных. Если переменная не
установлена, то её значение: "~/GNUstep".
.SH "ОКРУЖЕНИЕ"
.IP GNUSTEP_USER_ROOT/Defaults/WMWindowAttributes
.IP WMAKER_USER_ROOT/Defaults/WMWindowAttributes
Это файл, в который идёт запись.
.SH "СМОТРИ ТАКЖЕ"
.BR geticonset (1),

4
doc/ru/setstyle.1
View File

@@ -41,12 +41,12 @@ setstyle \- устанавливает опции связанные со сти
.B \-\-version
Вывести номер версии
.SH "ОКРУЖЕНИЕ"
.IP GNUSTEP_USER_ROOT
.IP WMAKER_USER_ROOT
Указывает начальный путь к папке Defaults. "Defaults/" приписывается к этой
переменной, чтобы определить настоящее расположение данных. Если переменная не
установлена, то её значение: "~/GNUstep".
.SH "ФАЙЛЫ"
.IP GNUSTEP_USER_ROOT/Defaults/WindowMaker
.IP WMAKER_USER_ROOT/Defaults/WindowMaker
Это файл с которым идёт взаимодействие.
.SH "СМОТРИ ТАКЖЕ"
.BR getstyle (1),

4
doc/ru/wdwrite.1
View File

@@ -23,12 +23,12 @@ wdwrite \- записывает пары ключ/значение в домен
.B \-\-version
Вывести номер версии.
.SH "ОКРУЖЕНИЕ"
.IP GNUSTEP_USER_ROOT
.IP WMAKER_USER_ROOT
Указывает начальный путь к папке Defaults. "Defaults/" приписывается к этой
переменной, чтобы определить настоящее расположение данных. Если переменная не
установлена, то её значение: "~/GNUstep".
.SH "ФАЙЛЫ"
Домены находятся в директории GNUSTEP_USER_ROOT/Defaults/ .
Домены находятся в директории WMAKER_USER_ROOT/Defaults/ .
.SH "СМОТРИ ТАКЖЕ"
.BR wmaker (1)
.SH "АВТОРЫ"

2
doc/ru/wmaker.1
View File

@@ -108,7 +108,7 @@ Window Maker это оконный менеджер для X11 эмулирую
.B /usr/share/WindowMaker/Themes/
Угадайте… ;-)
.SH "ОКРУЖЕНИЕ"
.IP GNUSTEP_USER_ROOT
.IP WMAKER_USER_ROOT
Указывает начальный путь к папке Defaults. "Defaults/" приписывается к этой
переменной, чтобы определить настоящее расположение данных. Если переменная не
установлена, то её значение: "~/GNUstep".

4
doc/seticons.1
View File

@@ -22,12 +22,12 @@ print a help message with the list of options
.B \-\-version
print the version of Window Maker from which the program comes
.SH ENVIRONMENT
.IP GNUSTEP_USER_ROOT
.IP WMAKER_USER_ROOT
specifies the initial path for the Defaults directory. "Defaults/" is
appended to this variable to determine the actual location of the
databases. If the variable is not set, it defaults to "~/GNUstep"
.SH FILES
.IP GNUSTEP_USER_ROOT/Defaults/WMWindowAttributes
.IP WMAKER_USER_ROOT/Defaults/WMWindowAttributes
This is the actual file that's written.
.SH SEE ALSO
.BR geticonset (1),

4
doc/setstyle.1
View File

@@ -43,12 +43,12 @@ ignore font related options from the style file
.B \-\-version
print the version of Window Maker from which the program comes.
.SH ENVIRONMENT
.IP GNUSTEP_USER_ROOT
.IP WMAKER_USER_ROOT
specifies the initial path for the Defaults directory. "Defaults/" is
appended to this variable to determine the actual location of the
databases. If the variable is not set, it defaults to "~/GNUstep"
.SH FILES
.IP GNUSTEP_USER_ROOT/Defaults/WindowMaker
.IP WMAKER_USER_ROOT/Defaults/WindowMaker
This is the actual file that's written.
.SH SEE ALSO
.BR getstyle (1),

4
doc/sk/geticonset.1
View File

@@ -18,12 +18,12 @@ vyp
.B \-\-version
vyp<EFBFBD><EFBFBD>e <20><>slo verzie
.SH PREMENN<EFBFBD> PROSTREDIA
.IP GNUSTEP_USER_ROOT
.IP WMAKER_USER_ROOT
<EFBFBD>pecifikuje cestu k adres<65>ru Defaults. "Defaults/" je pridan<61> k tejto
premennej, <20><>m sa ur<75><72> umiestnenie datab<61>z. Ak premenn<6E> nie je nastaven<65>,
jej implicitn<74> hodnota je "~/GNUstep"
.SH S<EFBFBD>BORY
.IP GNUSTEP_USER_ROOT/Defaults/WMWindowAttributes
.IP WMAKER_USER_ROOT/Defaults/WMWindowAttributes
Toto je s<>bor, ktor<6F> sa zap<61><70>e.
.SH POZRI TIE<EFBFBD>
.BR seticons (1),

4
doc/sk/getstyle.1
View File

@@ -50,12 +50,12 @@ Táto voµba je v¾dy nastavená, ak je pou¾itá voµba \-p.
vytvorí balík s témou v adresári nazvanom podµa mena témy s príponou .themed.
.SH PREMENNÉ PROSTREDIA
.IP GNUSTEP_USER_ROOT
.IP WMAKER_USER_ROOT
¹pecifikuje cestu k adresáru Defaults. "Defaults/" je pridané k tejto
premennej, èím sa urèí umiestnenie databáz. Ak premenná nie je nastavená,
jej implicitná hodnota je "~/GNUstep"
.SH SÚBORY
.IP GNUSTEP_USER_ROOT/Defaults/WindowMaker
.IP WMAKER_USER_ROOT/Defaults/WindowMaker
Toto je súbor, ktorý sa zapí¹e.
.SH POZRI TIE®
.BR setstyle (1),

4
doc/sk/seticons.1
View File

@@ -20,12 +20,12 @@ vyp
.B \-\-version
vyp<EFBFBD><EFBFBD>e <20><>slo verzie
.SH PREMENN<EFBFBD> PROSTREDIA
.IP GNUSTEP_USER_ROOT
.IP WMAKER_USER_ROOT
<EFBFBD>pecifikuje cestu k adres<65>ru Defaults. "Defaults/" je pridan<61> k tejto
premennej, <20><>m sa ur<75><72> umiestnenie datab<61>z. Ak premenn<6E> nie je nastaven<65>,
jej implicitn<74> hodnota je "~/GNUstep"
.SH S<EFBFBD>BORY
.IP GNUSTEP_USER_ROOT/Defaults/WMWindowAttributes
.IP WMAKER_USER_ROOT/Defaults/WMWindowAttributes
Toto je s<>bor, ktor<6F> sa zap<61><70>e.
.SH POZRI TIE<EFBFBD>
.BR geticonset (1),

4
doc/sk/setstyle.1
View File

@@ -39,12 +39,12 @@ vypí¹e pomocný text
.B \-\-version
vypí¹e èíslo verzie
.SH PREMENNÉ PROSTREDIA
.IP GNUSTEP_USER_ROOT
.IP WMAKER_USER_ROOT
¹pecifikuje cestu k adresáru Defaults. "Defaults/" je pridané k tejto
premennej, èím sa urèí umiestnenie databáz. Ak premenná nie je nastavená,
jej implicitná hodnota je "~/GNUstep"
.SH SÚBORY
.IP GNUSTEP_USER_ROOT/Defaults/WindowMaker
.IP WMAKER_USER_ROOT/Defaults/WindowMaker
Toto je súbor, ktorý sa zapí¹e.
.SH POZRI TIE®
.BR getstyle (1),

4
doc/sk/wdwrite.1
View File

@@ -23,12 +23,12 @@ vyp
.B \-\-version
vyp<EFBFBD><EFBFBD>e <20><>slo verzie
.SH PREMENN<EFBFBD> PROSTREDIA
.IP GNUSTEP_USER_ROOT
.IP WMAKER_USER_ROOT
<EFBFBD>pecifikuje cestu k adres<65>ru Defaults. "Defaults/" je pridan<61> k tejto
premennej, <20><>m sa ur<75><72> umiestnenie datab<61>z. Ak premenn<6E> nie je nastaven<65>,
jej implicitn<74> hodnota je "~/GNUstep"
.SH S<EFBFBD>BORY
Dom<EFBFBD>ny sa nach<63>dzaj<61> v GNUSTEP_USER_ROOT/Defaults/
Dom<EFBFBD>ny sa nach<63>dzaj<61> v WMAKER_USER_ROOT/Defaults/
.SH POZRI TIE<EFBFBD>
.BR wmaker (1)
.SH AUTOR

2
doc/sk/wmaker.1
View File

@@ -110,7 +110,7 @@ a tu.
.B /usr/share/WindowMaker/Themes/
Teraz to sk<73>s s<>m... ;-)
.SH PREMENN<EFBFBD> PROSTREDIA
.IP GNUSTEP_USER_ROOT
.IP WMAKER_USER_ROOT
<EFBFBD>pecifikuje cestu k adres<65>ru Defaults. "Defaults/" je pridan<61> k tejto
premennej, <20><>m sa ur<75><72> umiestnenie datab<61>z. Ak premenn<6E> nie je nastaven<65>,
jej implicitn<74> hodnota je "~/GNUstep"

4
doc/wdwrite.1
View File

@@ -23,12 +23,12 @@ print a help message with the list of options
.B \-\-version
print the version of Window Maker from which the program comes
.SH ENVIRONMENT
.IP GNUSTEP_USER_ROOT
.IP WMAKER_USER_ROOT
specifies the initial path for the Defaults directory. "Defaults/" is
appended to this variable to determine the actual location of the
databases. If the variable is not set, it defaults to "~/GNUstep"
.SH FILES
The domains reside in GNUSTEP_USER_ROOT/Defaults/
The domains reside in WMAKER_USER_ROOT/Defaults/
.SH SEE ALSO
.BR wdread (1),
.BR wmaker (1)

2
doc/wmaker.in
View File

@@ -136,7 +136,7 @@ System wide styles are here
.B @pkgdatadir@/Themes/
Guess... ;-)
.SH ENVIRONMENT
.IP GNUSTEP_USER_ROOT
.IP WMAKER_USER_ROOT
specifies the initial path for the Defaults directory. "Defaults/" is
appended to this variable to determine the actual location of the
databases. If the variable is not set, it defaults to "~/GNUstep"

8
util/wmaker.inst.in
View File

@@ -62,7 +62,7 @@ copy() {
if [ "$file" = "WindowMaker" ]; then
sed -e "s|~/GNUstep|$GSDIR|g" "$source" > "$target"
else
if test "x$GNUSTEP_USER_ROOT" != "x"; then
if test "x$WMAKER_USER_ROOT" != "x"; then
sed -e "s|\$HOME/GNUstep|$GSDIR|g" \
"$source" > "$target"
fi
@@ -97,7 +97,7 @@ if [ ! -d "$USERDIR" ]; then
fi
if test "x$GNUSTEP_USER_ROOT" = "x"; then
if test "x$WMAKER_USER_ROOT" = "x"; then
cd "$USERDIR"
GSDIR="$USERDIR/GNUstep"
if [ ! -d "$GSDIR" ]; then
@@ -105,11 +105,11 @@ if test "x$GNUSTEP_USER_ROOT" = "x"; then
make_dir "$GSDIR"
fi
else
GSDIR="$GNUSTEP_USER_ROOT"
GSDIR="$WMAKER_USER_ROOT"
if [ ! -d "$GSDIR" ]; then
# in this case, and in this case only, mkdir needs -p option
mkdir -p $GSDIR || {
echo "Directory specified in GNUSTEP_USER_ROOT environment variable does not exist and could not be created"
echo "Directory specified in WMAKER_USER_ROOT environment variable does not exist and could not be created"
exit 1
}
chmod +rwx $GSDIR || exit 1