Skip to content

Commit db6ab0a

Browse files
Hayao0819Hayao0819
committed
Merge branch 'dev' into dev-stable
2 parents 18f757e + d83f84c commit db6ab0a

15 files changed

Lines changed: 54 additions & 15 deletions

File tree

‎channels/lxde/airootfs.any/etc/profile.d/startx.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
if [[ -z "${DISPLAY}" && "${XDG_VTNR}" -eq 1 ]]; then
1+
if [[ $(systemctl is-active graphical.target) = "active" ]] && [[ -z "${DISPLAY}" && "${XDG_VTNR}" -eq 1 ]]; then
22
exec startx
33
fi

‎channels/lxde/airootfs.any/etc/skel/.bash_profile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44

55
[[ -f ~/.bashrc ]] && . ~/.bashrc
66
[[ -f ~/.setup.sh ]] && bash ~/.setup.sh
7-
if systemctl -q is-active graphical.target && [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then
7+
if [[ $(systemctl is-active graphical.target) = "active" ]] && [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then
88
exec startx
99
fi

‎channels/lxde/airootfs.any/etc/skel/.zprofile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
#
44

55
[[ -f ~/.setup.sh ]] && bash ~/.setup.sh
6-
if systemctl -q is-active graphical.target && [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then
6+
if [[ $(systemctl is-active graphical.target) = "active" ]] && [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then
77
exec startx
88
fi

‎channels/lxde/airootfs.x86_64/etc/skel/Desktop/welcome-to-alter-jp.desktop‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
[Desktop Entry]
2+
Version=1.0
3+
Type=Application
4+
Name=Welcome to Alter Linux
5+
Exec=/usr/bin/chromium https://fascode.net/projects/linux/alter/welcome.php
6+
Terminal=false
7+
Comment=This page is useful for using AlterLinux.
8+
Icon=/usr/share/icons/hicolor/scalable/alter.svg
9+
URL=https://fascode.net/projects/linux/alter/welcome.php
10+
11+
Name[ja]=AlterLinuxへようこそ
12+
GenericName[ja]=AlterLinuxへようこそ
13+
Comment[ja]=AlterLinuxの利用に役立つページです。

‎channels/lxde/airootfs.x86_64/etc/skel/Desktop/welcome-to-alter.desktop‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
Version=1.0
33
Type=Application
44
Name=Welcome to Alter Linux
5-
Exec=/usr/bin/chromium https://fascode.net/projects/linux/alter/welcome.php
5+
Exec=/usr/bin/chromium https://fascode.net/en/projects/linux/alter/welcome.php
66
Terminal=false
77
Comment=This page is useful for using AlterLinux.
88
Icon=/usr/share/icons/hicolor/scalable/alter.svg
9-
URL=https://fascode.net/projects/linux/alter/welcome.php
9+
URL=https://fascode.net/en/projects/linux/alter/welcome.php
1010

1111
Name[ja]=AlterLinuxへようこそ
1212
GenericName[ja]=AlterLinuxへようこそ

‎channels/plasma/airootfs.any/etc/profile.d/startx.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
if [[ -z "${DISPLAY}" && "${XDG_VTNR}" -eq 1 ]]; then
1+
if [[ $(systemctl is-active graphical.target) = "active" ]] && [[ -z "${DISPLAY}" && "${XDG_VTNR}" -eq 1 ]]; then
22
exec startx
33
fi

‎channels/plasma/airootfs.any/etc/skel/.bash_profile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44

55
[[ -f ~/.bashrc ]] && . ~/.bashrc
66
[[ -f ~/.setup.sh ]] && ~/.setup.sh
7-
if systemctl -q is-active graphical.target && [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then
7+
if [[ $(systemctl is-active graphical.target) = "active" ]] && [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then
88
exec startx
99
fi

‎channels/plasma/airootfs.any/etc/skel/.zprofile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
#
44

55
[[ -f ~/.setup.sh ]] && ~/.setup.sh
6-
if systemctl -q is-active graphical.target && [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then
6+
if [[ $(systemctl is-active graphical.target) = "active" ]] && [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then
77
exec startx
88
fi

‎channels/plasma/airootfs.x86_64/etc/skel/Desktop/welcome-to-alter-jp.desktop‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
[Desktop Entry]
2+
Version=1.0
3+
Type=Application
4+
Name=Welcome to Alter Linux
5+
Exec=/usr/bin/chromium https://fascode.net/projects/linux/alter/welcome.php
6+
Terminal=false
7+
Comment=This page is useful for using AlterLinux.
8+
Icon=/usr/share/icons/hicolor/scalable/alter.svg
9+
URL=https://fascode.net/projects/linux/alter/welcome.php
10+
11+
Name[ja]=AlterLinuxへようこそ
12+
GenericName[ja]=AlterLinuxへようこそ
13+
Comment[ja]=AlterLinuxの利用に役立つページです。

‎channels/plasma/airootfs.x86_64/etc/skel/Desktop/welcome-to-alter.desktop‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
Version=1.0
33
Type=Application
44
Name=Welcome to Alter Linux
5-
Exec=/usr/bin/chromium https://fascode.net/projects/linux/alter/welcome.php
5+
Exec=/usr/bin/chromium https://fascode.net/en/projects/linux/alter/welcome.php
66
Terminal=false
77
Comment=This page is useful for using AlterLinux.
88
Icon=/usr/share/icons/hicolor/scalable/alter.svg
9-
URL=https://fascode.net/projects/linux/alter/welcome.php
9+
URL=https://fascode.net/en/projects/linux/alter/welcome.php
1010

1111
Name[ja]=AlterLinuxへようこそ
1212
GenericName[ja]=AlterLinuxへようこそ

0 commit comments

Comments
 (0)