Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
manjaro-system
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Test Cases
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Packages
Core
manjaro-system
Commits
61e78080
Commit
61e78080
authored
Dec 08, 2019
by
Bernhard Landauer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
don't replace gtk3-classic again
parent
8b25fffe
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
11 deletions
+18
-11
.gitignore
.gitignore
+1
-0
PKGBUILD
PKGBUILD
+5
-1
manjaro-update-system.sh
manjaro-update-system.sh
+12
-10
No files found.
.gitignore
0 → 100644
View file @
61e78080
*.log
PKGBUILD
View file @
61e78080
...
...
@@ -2,7 +2,7 @@
# Maintainer : Bernhard Landauer <oberon@manjaro.org>
pkgname
=
manjaro-system
pkgver
=
$(
date
+%Y%m%d
)
pkgver
=
20191208
pkgrel
=
1
pkgdesc
=
"Manjaro Linux System - Update script"
arch
=(
'any'
)
...
...
@@ -14,6 +14,10 @@ install=manjaro-update-system.sh
source
=(
'fsck.overlay'
)
sha256sums
=(
'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
)
pkgver
()
{
date
+%Y%m%d
}
package
()
{
install
-Dm755
"
$srcdir
/fsck.overlay"
"
$pkgdir
/usr/bin/fsck.overlay"
}
manjaro-update-system.sh
View file @
61e78080
...
...
@@ -224,16 +224,18 @@ post_upgrade() {
chmod
755 /var/lib/AccountsService/icons/
fi
# replace gtk3-classic with regular upstream gtk3
if
[
"
$(
pacman
-Qq
|
grep
'gtk3-classic'
-m1
)
"
==
"gtk3-classic"
]
;
then
msg
"replacing gkt3-classic with regular gtk3 ..."
msg
"If you want to continue using the -classic or -mushroom version please install from the AUR."
rm
/var/lib/pacman/db.lck &> /dev/null
pacman
-Rdd
--noconfirm
gtk3-classic
pacman
-S
--noconfirm
gtk3
if
[
"
$(
pacman
-Qq
|
grep
'lib32-gtk3-classic'
-m1
)
"
==
"lib32-gtk3-classic"
]
;
then
pacman
-Rdd
--noconfirm
lib32-gtk3-classic
pacman
-S
--noconfirm
lib32-gtk3
# replace gtk3-classic with regular upstream gtk3 unless reinstalled since m-s 20191208-1
if
[
"
$(
vercmp
$(
pacman
-Q
|
grep
'manjaro-system'
-m1
|
cut
-d
' '
-f2
)
20191208-1
)
"
-lt
0
]
;
then
if
[
"
$(
pacman
-Qq
|
grep
'gtk3-classic'
-m1
)
"
==
"gtk3-classic"
]
;
then
msg
"replacing gkt3-classic with regular gtk3 ..."
msg
"If you want to continue using the -classic or -mushroom version please install from the AUR."
rm
/var/lib/pacman/db.lck &> /dev/null
pacman
-Rdd
--noconfirm
gtk3-classic
pacman
-S
--noconfirm
gtk3
if
[
"
$(
pacman
-Qq
|
grep
'lib32-gtk3-classic'
-m1
)
"
==
"lib32-gtk3-classic"
]
;
then
pacman
-Rdd
--noconfirm
lib32-gtk3-classic
pacman
-S
--noconfirm
lib32-gtk3
fi
fi
fi
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment