Skip to content

Commit

Permalink
Merge pull request autokey#802 from Elliria/update-apt-to-apt-get
Browse files Browse the repository at this point in the history
Update apt to apt get.
  • Loading branch information
josephj11 authored Mar 6, 2023
2 parents cb078d4 + 0f877b6 commit c6bd09d
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 12 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ jobs:
${{ runner.os }}-
- name: Install dependencies
run: |
sudo apt update
sudo apt install $(cat apt-requirements.txt)
sudo apt-get update
sudo apt-get install $(cat apt-requirements.txt)
python -m pip install --upgrade pip
pip install flake8 pytest pytest-cov wheel
pip install -r pip-requirements.txt
Expand Down Expand Up @@ -85,8 +85,8 @@ jobs:
- name: Install dependencies
run: |
sudo apt update
sudo apt install $(cat apt-requirements.txt)
sudo apt-get update
sudo apt-get install $(cat apt-requirements.txt)
python -m pip install --upgrade pip
pip install build
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/python-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ jobs:
- name: Install dependencies
run: |
sudo apt update
sudo apt install $(cat apt-requirements.txt)
sudo apt-get update
sudo apt-get install $(cat apt-requirements.txt)
python -m pip install --upgrade pip
pip install flake8 wheel
pip install -r pip-requirements.txt
Expand Down Expand Up @@ -107,8 +107,8 @@ jobs:
- name: Install dependencies
run: |
sudo apt update
sudo apt install $(cat apt-requirements.txt)
sudo apt-get update
sudo apt-get install $(cat apt-requirements.txt)
python -m pip install --upgrade pip
pip install flake8 tox pytest pytest-cov wheel
pip install -r pip-requirements.txt
Expand Down Expand Up @@ -153,8 +153,8 @@ jobs:

- name: Install OS dependencies only
run: |
sudo apt update
sudo apt install $(cat apt-requirements.txt)
sudo apt-get update
sudo apt-get install $(cat apt-requirements.txt)
python -m pip install --upgrade pip
pip install dbus-python gobject pygobject PyQt5 qscintilla
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ Important misc changes
- Change the default phrase send mode to `ctrl+v` (paste using clipboard) rather than sending keys one at a time.
- This version represents some significant refactoring since the previous update, so bug reports will be highly appreciated.
- Add two sections to the issue template.
- Change all **sudo apt** references in **master** to **sudo apt-get** to satisfy part of issue #772.

Features
---------
Expand Down
2 changes: 1 addition & 1 deletion INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ Or the Qt version:
sudo dpkg --install autokey-qt_<version>.deb autokey-common_<version>.deb

After dpkg finished, run this to install any missing dependencies:
sudo apt install -f
sudo apt-get install -f
2 changes: 1 addition & 1 deletion debian/build.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

[ -f debian/build_requirements.txt ] && \
cat debian/build_requirements.txt | xargs sudo apt install -y
cat debian/build_requirements.txt | xargs sudo apt-get install -y

VERSION=$(git describe --tags --abbrev=0 --match "v*.*.*")
# Strip leading 'v' because that is invalid as a debian version number
Expand Down

0 comments on commit c6bd09d

Please sign in to comment.